summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2016-03-18 11:31:45 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2016-03-18 11:31:45 +0900
commit4e0cff107ebaba8cfcac18efca7dbaa8d82ce888 (patch)
tree4e931f702d873c060829fed66a555eb6d587b955 /src
parent5f908de18d153fc4eea68f349f31834a3350b5a7 (diff)
Revert "edje: remove unnecessary repetition during copying code"
This reverts commit 37408aef95ee5794f9030ece34be9d6b097d064e. This commit is reverted temporarily to prevent build fail. This commit reveals the hidden bug when elementary theme is built. This commit will be applied after the hidden bug is resolved.
Diffstat (limited to 'src')
-rw-r--r--src/bin/edje/edje_cc_handlers.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 5c6f14dda7..8fb43cf15f 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -4438,10 +4438,6 @@ st_collections_group_inherit(void)
4438 cd2 = eina_list_nth(codes, de->id); 4438 cd2 = eina_list_nth(codes, de->id);
4439 cd = eina_list_data_get(eina_list_last(codes)); 4439 cd = eina_list_data_get(eina_list_last(codes));
4440 4440
4441 cd->is_lua = cd2->is_lua;
4442 cd->shared = STRDUP(cd2->shared);
4443 cd->original = STRDUP(cd2->original);
4444
4445 EINA_LIST_FOREACH(cd2->programs, l, cp2) 4441 EINA_LIST_FOREACH(cd2->programs, l, cp2)
4446 { 4442 {
4447 cp = mem_alloc(SZ(Code_Program)); 4443 cp = mem_alloc(SZ(Code_Program));
@@ -4450,6 +4446,9 @@ st_collections_group_inherit(void)
4450 cp->l2 = cp2->l2; 4446 cp->l2 = cp2->l2;
4451 cp->script = STRDUP(cp2->script); 4447 cp->script = STRDUP(cp2->script);
4452 cp->original = STRDUP(cp2->original); 4448 cp->original = STRDUP(cp2->original);
4449 cd->is_lua = cd2->is_lua;
4450 cd->shared = STRDUP(cd2->shared);
4451 cd->original = STRDUP(cd2->original);
4453 cd->programs = eina_list_append(cd->programs, cp); 4452 cd->programs = eina_list_append(cd->programs, cp);
4454 data_queue_copied_anonymous_lookup(pc, &(cp2->id), &(cp->id)); 4453 data_queue_copied_anonymous_lookup(pc, &(cp2->id), &(cp->id));
4455 } 4454 }