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

return all fm objects matching a path 

fix T1191
This commit is contained in:
Mike Blumenkrantz 2014-05-07 14:11:20 -04:00
parent adcf979e5c
commit 787ca774de
1 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/bin/e_fm.c
View File

@ -275,7 +275,7 @@ static void _e_fm2_config_free(E_Fm2_Config *cfg);
static void _e_fm2_dir_load_props(E_Fm2_Smart_Data *sd); static void _e_fm2_dir_load_props(E_Fm2_Smart_Data *sd);
static void _e_fm2_dir_save_props(E_Fm2_Smart_Data *sd); static void _e_fm2_dir_save_props(E_Fm2_Smart_Data *sd);
static Evas_Object *_e_fm2_file_fm2_find(const char *file); static Eina_List *_e_fm2_file_fm2_find(const char *file);
static E_Fm2_Icon *_e_fm2_icon_find(Evas_Object *obj, const char *file); static E_Fm2_Icon *_e_fm2_icon_find(Evas_Object *obj, const char *file);
static const char *_e_fm2_uri_escape(const char *path); static const char *_e_fm2_uri_escape(const char *path);
static Eina_List *_e_fm2_uri_icon_list_get(Eina_List *uri); static Eina_List *_e_fm2_uri_icon_list_get(Eina_List *uri);
@ -4345,11 +4345,11 @@ _e_fm2_config_free(E_Fm2_Config *cfg)
free(cfg); free(cfg);
} }
static Evas_Object * static Eina_List *
_e_fm2_file_fm2_find(const char *file) _e_fm2_file_fm2_find(const char *file)
{ {
char *dir; char *dir;
Eina_List *l; Eina_List *l, *ret = NULL;
Evas_Object *obj; Evas_Object *obj;
dir = ecore_file_dir_get(file); dir = ecore_file_dir_get(file);
@ -4359,13 +4359,10 @@ _e_fm2_file_fm2_find(const char *file)
if ((_e_fm2_list_walking > 0) && if ((_e_fm2_list_walking > 0) &&
(eina_list_data_find(_e_fm2_list_remove, obj))) continue; (eina_list_data_find(_e_fm2_list_remove, obj))) continue;
if (!strcmp(e_fm2_real_path_get(obj), dir)) if (!strcmp(e_fm2_real_path_get(obj), dir))
{ ret = eina_list_append(ret, obj);
free(dir);
return obj;
}
} }
free(dir); free(dir);
return NULL; return ret;
} }
static E_Fm2_Icon * static E_Fm2_Icon *
@ -4480,13 +4477,16 @@ _e_fm2_uri_icon_list_get(Eina_List *uri)
EINA_LIST_FOREACH(uri, l, path) EINA_LIST_FOREACH(uri, l, path)
{ {
Eina_List *fms;
Evas_Object *fm; Evas_Object *fm;
E_Fm2_Icon *ic; E_Fm2_Icon *ic;
const char *file; const char *file;
ic = NULL; ic = NULL;
fm = _e_fm2_file_fm2_find(path); fms = _e_fm2_file_fm2_find(path);
if (!fm) continue; if (!fms) continue;
fm = eina_list_data_get(fms);
eina_list_free(fms);
file = ecore_file_file_get(path); 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);
@ -7361,6 +7361,7 @@ _e_fm2_cb_drag_finished(E_Drag *drag, int dropped __UNUSED__)
E_Fm2_Uri *uri; E_Fm2_Uri *uri;
const char *p; const char *p;
char buf[PATH_MAX * 3 + 7]; char buf[PATH_MAX * 3 + 7];
Eina_List *fms;
Evas_Object *fm; Evas_Object *fm;
int i; int i;
@ -7375,8 +7376,8 @@ _e_fm2_cb_drag_finished(E_Drag *drag, int dropped __UNUSED__)
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
if (!uri) continue; if (!uri) continue;
fm = _e_fm2_file_fm2_find(uri->path); fms = _e_fm2_file_fm2_find(uri->path);
if (fm) if (fms)
{ {
const char *file; const char *file;
E_Fm2_Icon *ic; E_Fm2_Icon *ic;
@ -7384,19 +7385,24 @@ _e_fm2_cb_drag_finished(E_Drag *drag, int dropped __UNUSED__)
file = ecore_file_file_get(uri->path); file = ecore_file_file_get(uri->path);
if (file) if (file)
{ {
ic = _e_fm2_icon_find(fm, file); EINA_LIST_FREE(fms, fm)
if (ic)
{ {
ic->drag.dnd = EINA_FALSE; ic = _e_fm2_icon_find(fm, file);
if (ic->sd->dnd_scroller) ecore_animator_del(ic->sd->dnd_scroller); if (ic && ic->drag.dnd)
ic->sd->dnd_scroller = NULL; {
if (ic->drag.dnd_end_timer) ecore_timer_reset(ic->drag.dnd_end_timer); ic->drag.dnd = EINA_FALSE;
else ic->drag.dnd_end_timer = ecore_timer_add(0.2, (Ecore_Task_Cb)_e_fm2_cb_drag_finished_show, ic); if (ic->sd->dnd_scroller) ecore_animator_del(ic->sd->dnd_scroller);
/* NOTE: ic->sd->dnd_scroller = NULL;
* do not touch ic after this callback; it's possible that it may have been deleted if (ic->drag.dnd_end_timer) ecore_timer_reset(ic->drag.dnd_end_timer);
*/ else ic->drag.dnd_end_timer = ecore_timer_add(0.2, (Ecore_Task_Cb)_e_fm2_cb_drag_finished_show, ic);
evas_object_smart_callback_call(ic->sd->obj, "dnd_end", &ic->info); /* NOTE:
* do not touch ic after this callback; it's possible that it may have been deleted
*/
evas_object_smart_callback_call(ic->sd->obj, "dnd_end", &ic->info);
break;
}
} }
eina_list_free(fms);
} }
} }
@ -10532,10 +10538,15 @@ _e_fm_overwrite_dialog(int pid, const char *str)
if (ere) if (ere)
{ {
E_Fm2_Smart_Data *sd; E_Fm2_Smart_Data *sd;
Eina_List *fms;
Evas_Object *fm;
sd = evas_object_smart_data_get(_e_fm2_file_fm2_find(ere->src)); fms = _e_fm2_file_fm2_find(ere->src);
if (sd) EINA_LIST_FREE(fms, fm)
E_LIST_FOREACH(sd->icons, _e_fm2_cb_drag_finished_show); {
sd = evas_object_smart_data_get(fm);
E_LIST_FOREACH(sd->icons, _e_fm2_cb_drag_finished_show);
}
} }
dialog = e_dialog_new(NULL, "E", "_fm_overwrite_dialog"); dialog = e_dialog_new(NULL, "E", "_fm_overwrite_dialog");