Enlightenment CVS committal Author : englebass Project : e17 Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas Modified Files: ecore_evas.c ecore_evas_private.h ecore_evas_x.c Log Message: Don't use an idler to delete the evas. This wont work during ecore main loop shutdown. =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- ecore_evas.c 27 Jul 2006 16:14:33 -0000 1.29 +++ ecore_evas.c 5 Apr 2007 06:53:41 -0000 1.30 @@ -6,8 +6,6 @@ static int _ecore_evas_init_count = 0; -static int _ecore_evas_idle_enter_delete(void *data); - /** * Query if a particular renginering engine target has support * @param engine The engine to check support for @@ -139,9 +137,7 @@ "ecore_evas_free"); return; } - if (ee->delete_idle_enterer) return; - ee->delete_idle_enterer = - ecore_idle_enterer_add(_ecore_evas_idle_enter_delete, ee); + _ecore_evas_free(ee); return; } @@ -1764,11 +1760,6 @@ _ecore_evas_free(Ecore_Evas *ee) { ECORE_MAGIC_SET(ee, ECORE_MAGIC_NONE); - if (ee->delete_idle_enterer) - { - ecore_idle_enterer_del(ee->delete_idle_enterer); - ee->delete_idle_enterer = NULL; - } while (ee->sub_ecore_evas) { _ecore_evas_free(ee->sub_ecore_evas->data); @@ -1792,14 +1783,4 @@ ee->evas = NULL; if (ee->engine.func->fn_free) ee->engine.func->fn_free(ee); free(ee); -} - -static int -_ecore_evas_idle_enter_delete(void *data) -{ - Ecore_Evas *ee; - - ee = (Ecore_Evas *)data; - _ecore_evas_free(ee); - return 0; } =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_private.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- ecore_evas_private.h 20 Oct 2006 01:46:41 -0000 1.25 +++ ecore_evas_private.h 5 Apr 2007 06:53:41 -0000 1.26 @@ -164,8 +164,6 @@ char should_be_visible : 1; char alpha : 1; - Ecore_Idle_Enterer *delete_idle_enterer; - Evas_Hash *data; struct { =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -3 -r1.93 -r1.94 --- ecore_evas_x.c 16 Jan 2007 10:17:46 -0000 1.93 +++ ecore_evas_x.c 5 Apr 2007 06:53:41 -0000 1.94 @@ -110,14 +110,12 @@ Evas_List *ll; #endif - if (ee->delete_idle_enterer) return; #ifdef BUILD_ECORE_EVAS_BUFFER for (ll = ee->sub_ecore_evas; ll; ll = ll->next) { Ecore_Evas *ee2; ee2 = ll->data; - if (ee2->delete_idle_enterer) continue; if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2); _ecore_evas_buffer_render(ee2); if (ee2->func.fn_post_render) ee2->func.fn_post_render(ee2); @@ -360,7 +358,6 @@ Ecore_Evas *ee; ee = evas_hash_find(ecore_evases_hash, _ecore_evas_x_winid_str_get(win)); - if ((ee) && (ee->delete_idle_enterer)) return NULL; return ee; } ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs