vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

must dissociate even if we will not delete the canvas. 

otherwise subsequent associate requests will crash on us by using stale pointer.



SVN revision: 38271
This commit is contained in:
Gustavo Sverzut Barbieri 2008-12-21 22:29:50 +00:00
parent b1f00aa9d5
commit 0ec59ba102
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
legacy/ecore/src/lib/ecore_evas/ecore_evas_util.c
View File

@ -146,6 +146,13 @@ _ecore_evas_obj_callback_del(void *data, Evas *e, Evas_Object *obj, void *event_
ecore_evas_free(ee);
}
static void
_ecore_evas_obj_callback_del_dissociate(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Ecore_Evas *ee = data;
_ecore_evas_object_dissociate(ee, obj);
}
static void
_ecore_evas_delete_request(Ecore_Evas *ee)
{
@ -342,10 +349,11 @@ _ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object
(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_ecore_evas_obj_callback_changed_size_hints, ee);
if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_DEL)
{
evas_object_event_callback_add
(obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del, ee);
}
evas_object_event_callback_add
(obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del, ee);
else
evas_object_event_callback_add
(obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del_dissociate, ee);
evas_object_intercept_move_callback_add
(obj, _ecore_evas_obj_intercept_move, ee);
@ -395,6 +403,8 @@ _ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj)
_ecore_evas_obj_callback_changed_size_hints, ee);
evas_object_event_callback_del_full
(obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del, ee);
evas_object_event_callback_del_full
(obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del_dissociate, ee);
evas_object_intercept_move_callback_del
(obj, _ecore_evas_obj_intercept_move);