From 9c22d6a9e9d4d0bf0a2129800bb78ada76f04a4a Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Mon, 6 Jun 2011 13:10:54 +0000 Subject: [PATCH] edje: parent link should be properly set before instantiating sub object. SVN revision: 59989 --- legacy/edje/src/lib/edje_load.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c index 847bd3e130..898ee7e9cf 100644 --- a/legacy/edje/src/lib/edje_load.c +++ b/legacy/edje/src/lib/edje_load.c @@ -699,6 +699,11 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g child_obj = edje_object_add(ed->base.evas); group_path = eina_list_append(group_path, group_path_entry); + if (rp->part->type == EDJE_PART_TYPE_GROUP) + { + _edje_real_part_swallow(rp, child_obj); + } + if (!_edje_object_file_set_internal(child_obj, file, source, group_path)) { _edje_thaw(ed); @@ -728,7 +733,6 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g edje_object_signal_callback_add(child_obj, "*", "*", _cb_signal_repeat, obj); if (rp->part->type == EDJE_PART_TYPE_GROUP) { - _edje_real_part_swallow(rp, child_obj); source = NULL; } else