jaehyun pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=4e0cff107ebaba8cfcac18efca7dbaa8d82ce888

commit 4e0cff107ebaba8cfcac18efca7dbaa8d82ce888
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date:   Fri Mar 18 11:31:45 2016 +0900

    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.
---
 src/bin/edje/edje_cc_handlers.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 5c6f14d..8fb43cf 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)
    cd2 = eina_list_nth(codes, de->id);
    cd = eina_list_data_get(eina_list_last(codes));
 
-   cd->is_lua = cd2->is_lua;
-   cd->shared = STRDUP(cd2->shared);
-   cd->original = STRDUP(cd2->original);
-
    EINA_LIST_FOREACH(cd2->programs, l, cp2)
      {
         cp = mem_alloc(SZ(Code_Program));
@@ -4450,6 +4446,9 @@ st_collections_group_inherit(void)
         cp->l2 = cp2->l2;
         cp->script = STRDUP(cp2->script);
         cp->original = STRDUP(cp2->original);
+        cd->is_lua = cd2->is_lua;
+        cd->shared = STRDUP(cd2->shared);
+        cd->original = STRDUP(cd2->original);
         cd->programs = eina_list_append(cd->programs, cp);
         data_queue_copied_anonymous_lookup(pc, &(cp2->id), &(cp->id));
      }

-- 


Reply via email to