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

* e: prevent segv when reinserting the same object. Should never happen 

but better to not segv.


SVN revision: 47558
This commit is contained in:
Cedric BAIL 2010-03-29 16:11:08 +00:00
parent 9f4f9be6ac
commit 70969e8b9f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/e_gadcon_popup.c
View File

@ -49,14 +49,17 @@ e_gadcon_popup_content_set(E_Gadcon_Popup *pop, Evas_Object *o)
E_OBJECT_TYPE_CHECK(pop, E_GADCON_POPUP_TYPE);
old_o = edje_object_part_swallow_get(pop->o_bg, "e.swallow.content");
if (old_o)
if (old_o != o)
{
edje_object_part_unswallow(pop->o_bg, old_o);
evas_object_del(old_o);
if (old_o)
{
edje_object_part_unswallow(pop->o_bg, old_o);
evas_object_del(old_o);
}
edje_object_part_swallow(pop->o_bg, "e.swallow.content", o);
evas_object_event_callback_add(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_e_gadcon_popup_changed_size_hints_cb, pop);
}
edje_object_part_swallow(pop->o_bg, "e.swallow.content", o);
evas_object_event_callback_add(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_e_gadcon_popup_changed_size_hints_cb, pop);
_e_gadcon_popup_size_recalc(pop, o);
}