enlightenment/ephoto
enlightenment
/
ephoto
7
0
Fork 3
Code Issues 3 Pull Requests Projects Releases Wiki Activity

eio_file_cancel() is async and will run on future main loop iteration. 

damn beast hard to find, but i guess ephoto is now ready (/me hides...)



SVN revision: 53337
This commit is contained in:
Gustavo Sverzut Barbieri 2010-10-13 05:06:18 +00:00
parent feba790912
commit 8bd148fa72
2 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/ephoto_directory_thumb.c
View File

@ -6,6 +6,7 @@ struct _Ephoto_Directory_Thumb
Eio_File *ls; Eio_File *ls;
Eina_List *objs; Eina_List *objs;
Ephoto_Entry *entry; Ephoto_Entry *entry;
Eina_Bool canceled:1;
}; };
static Eina_Hash *_pending_dirs = NULL; static Eina_Hash *_pending_dirs = NULL;
@ -13,7 +14,13 @@ static Eina_Hash *_pending_dirs = NULL;
static void static void
_ephoto_directory_thumb_free(Ephoto_Directory_Thumb *dt) _ephoto_directory_thumb_free(Ephoto_Directory_Thumb *dt)
{ {
if (dt->ls) eio_file_cancel(dt->ls); if (dt->ls)
{
dt->canceled = EINA_TRUE;
eio_file_cancel(dt->ls);
return;
}
eina_hash_del(_pending_dirs, dt->entry->path, dt); eina_hash_del(_pending_dirs, dt->entry->path, dt);
free(dt); free(dt);
@ -25,11 +32,15 @@ _ephoto_directory_thumb_free(Ephoto_Directory_Thumb *dt)
} }
static void static void
_obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) _obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{ {
Ephoto_Directory_Thumb *dt = data; Ephoto_Directory_Thumb *dt = data;
dt->objs = eina_list_remove(dt->objs, obj); dt->objs = eina_list_remove(dt->objs, obj);
if (!dt->objs) _ephoto_directory_thumb_free(dt); if (!dt->objs)
{
dt->canceled = EINA_TRUE;
_ephoto_directory_thumb_free(dt);
}
} }
static Eina_Bool static Eina_Bool
@ -49,7 +60,7 @@ _populate_end(void *data)
evas_object_event_callback_del_full(obj, EVAS_CALLBACK_DEL, _obj_del, dt); evas_object_event_callback_del_full(obj, EVAS_CALLBACK_DEL, _obj_del, dt);
dt->entry->dir_files_checked = EINA_TRUE; dt->entry->dir_files_checked = EINA_TRUE;
if (dt->entry->item) if ((dt->entry->item) && (!dt->canceled))
elm_gengrid_item_update(dt->entry->item); elm_gengrid_item_update(dt->entry->item);
_ephoto_directory_thumb_free(dt); _ephoto_directory_thumb_free(dt);

30
src/bin/ephoto_thumb_browser.c
View File

@ -30,6 +30,7 @@ struct _Ephoto_Thumb_Browser
struct { struct {
Ecore_Job *change_dir; Ecore_Job *change_dir;
} job; } job;
Eina_Bool layout_deleted : 1;
}; };
static Ephoto_Entry * static Ephoto_Entry *
@ -237,6 +238,13 @@ _ephoto_populate_end(void *data)
{ {
Ephoto_Thumb_Browser *tb = data; Ephoto_Thumb_Browser *tb = data;
tb->ls = NULL; tb->ls = NULL;
if (tb->layout_deleted)
{
free(tb);
return;
}
if (tb->pending.cb) if (tb->pending.cb)
{ {
tb->pending.cb((void*)tb->pending.data, NULL); tb->pending.cb((void*)tb->pending.data, NULL);
@ -440,10 +448,24 @@ static void
_layout_del(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info __UNUSED__) _layout_del(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
{ {
Ephoto_Thumb_Browser *tb = data; Ephoto_Thumb_Browser *tb = data;
if (tb->pending.cb) tb->pending.cb((void*)tb->pending.data, NULL); if (tb->pending.cb)
eina_stringshare_del(tb->pending.path); {
if (tb->ls) eio_file_cancel(tb->ls); tb->pending.cb((void*)tb->pending.data, NULL);
if (tb->job.change_dir) ecore_job_del(tb->job.change_dir); tb->pending.cb = NULL;
tb->pending.data = NULL;
}
eina_stringshare_replace(&tb->pending.path, NULL);
if (tb->job.change_dir)
{
ecore_job_del(tb->job.change_dir);
tb->job.change_dir = NULL;
}
if (tb->ls)
{
tb->layout_deleted = EINA_TRUE;
eio_file_cancel(tb->ls);
return;
}
free(tb); free(tb);
} }