summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-08-22 18:15:19 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-08-22 20:14:57 +0900
commitc8a8ee3f5e04e4ca05c145880eda91cdf6e6eb4c (patch)
treee13b2ca43395e86a0dfb2517d9721d5372e2269a
parent855cc98ee4d9109eaefbf903c614f4fd53ae2df2 (diff)
edje fix real part get
fixes CID 1039331
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_load.c39
1 files changed, 21 insertions, 18 deletions
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index c3c60854fb..fc79336399 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -1187,24 +1187,27 @@ _edje_object_collect(Edje *ed)
1187 int idx = 0; 1187 int idx = 0;
1188 1188
1189 rp = _edje_real_part_recursive_get(&ed, eud->part); 1189 rp = _edje_real_part_recursive_get(&ed, eud->part);
1190 if (rp->part->type != EDJE_PART_TYPE_BOX) continue ; 1190 if (rp)
1191 1191 {
1192 children = evas_object_box_children_get(rp->object); 1192 if (rp->part->type != EDJE_PART_TYPE_BOX) continue;
1193 EINA_LIST_FREE(children, child) 1193
1194 if (!evas_object_data_get(child, "\377 edje.box_item")) 1194 children = evas_object_box_children_get(rp->object);
1195 { 1195 EINA_LIST_FREE(children, child)
1196 EINA_LIST_FOREACH(l, ls, search) 1196 if (!evas_object_data_get(child, "\377 edje.box_item"))
1197 { 1197 {
1198 if (search->type == EDJE_USER_BOX_PACK && 1198 EINA_LIST_FOREACH(l, ls, search)
1199 search->u.box.child == child && 1199 {
1200 search->part == eud->part /* beauty of stringshare ! */) 1200 if (search->type == EDJE_USER_BOX_PACK &&
1201 { 1201 search->u.box.child == child &&
1202 search->u.box.index = idx++; 1202 search->part == eud->part /* beauty of stringshare ! */)
1203 break; 1203 {
1204 } 1204 search->u.box.index = idx++;
1205 } 1205 break;
1206 _edje_real_part_box_remove(eud->ed, rp, child); 1206 }
1207 } 1207 }
1208 _edje_real_part_box_remove(eud->ed, rp, child);
1209 }
1210 }
1208 } 1211 }
1209 break; 1212 break;
1210 case EDJE_USER_TABLE_PACK: 1213 case EDJE_USER_TABLE_PACK: