enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

fix efm crash when using XDS drags, also fix XDS drags to work again 

SVN revision: 80599
This commit is contained in:
Mike Blumenkrantz 2012-12-10 11:41:40 +00:00
parent 206acb6eb6
commit f9c87ab214
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/e_fm.c
View File

@ -4330,14 +4330,13 @@ _e_fm2_uri_icon_list_get(Eina_List *uri)
{ {
Evas_Object *fm; Evas_Object *fm;
E_Fm2_Icon *ic; E_Fm2_Icon *ic;
const char *file;
ic = NULL; ic = NULL;
fm = _e_fm2_file_fm2_find(path); fm = _e_fm2_file_fm2_find(path);
if (fm) if (!fm) continue;
{ file = ecore_file_file_get(path);
const char *file = ecore_file_file_get(path); ic = _e_fm2_icon_find(fm, file);
ic = _e_fm2_icon_find(fm, file);
}
icons = eina_list_append(icons, ic); icons = eina_list_append(icons, ic);
} }
return icons; return icons;
@ -6441,7 +6440,6 @@ _e_fm2_cb_dnd_selection_notify(void *data, const char *type, void *event)
} }
isel = _e_fm2_uri_icon_list_get(fsel); isel = _e_fm2_uri_icon_list_get(fsel);
if (!isel) return;
ox = 0; oy = 0; ox = 0; oy = 0;
EINA_LIST_FOREACH(isel, l, ic) EINA_LIST_FOREACH(isel, l, ic)
{ {
@ -6464,7 +6462,7 @@ _e_fm2_cb_dnd_selection_notify(void *data, const char *type, void *event)
if (sd->drop_all) /* drop arbitrarily into the dir */ if (sd->drop_all) /* drop arbitrarily into the dir */
{ {
/* move file into this fm dir */ /* move file into this fm dir */
for (ll = fsel, il = isel; ll && il; ll = eina_list_next(ll), il = eina_list_next(il)) for (ll = fsel, il = isel; ll; ll = eina_list_next(ll), il = eina_list_next(il))
{ {
ic = eina_list_data_get(il); ic = eina_list_data_get(il);
fp = eina_list_data_get(ll); fp = eina_list_data_get(ll);