forked from enlightenment/efl
Fix deletion of Edje with child "GROUP".
SVN revision: 31690
This commit is contained in:
parent
5193a28bba
commit
f068851044
|
@ -650,11 +650,12 @@ _edje_file_del(Edje *ed)
|
||||||
evas_object_data_del(rp->swallowed_object, "\377 edje.swallowing_part");
|
evas_object_data_del(rp->swallowed_object, "\377 edje.swallowing_part");
|
||||||
if (rp->part->mouse_events)
|
if (rp->part->mouse_events)
|
||||||
_edje_callbacks_del(rp->swallowed_object);
|
_edje_callbacks_del(rp->swallowed_object);
|
||||||
rp->swallowed_object = NULL;
|
|
||||||
|
|
||||||
/* Objects swallowed by the app do not get deleted, but those internally swallowed (GROUP type) do. */
|
/* Objects swallowed by the app do not get deleted, but those internally swallowed (GROUP type) do. */
|
||||||
if (rp->part->type == EDJE_PART_TYPE_GROUP)
|
if (rp->part->type == EDJE_PART_TYPE_GROUP)
|
||||||
evas_object_del(rp->swallowed_object);
|
evas_object_del(rp->swallowed_object);
|
||||||
|
|
||||||
|
rp->swallowed_object = NULL;
|
||||||
}
|
}
|
||||||
if (rp->text.text) evas_stringshare_del(rp->text.text);
|
if (rp->text.text) evas_stringshare_del(rp->text.text);
|
||||||
if (rp->text.font) evas_stringshare_del(rp->text.font);
|
if (rp->text.font) evas_stringshare_del(rp->text.font);
|
||||||
|
|
Loading…
Reference in New Issue