edje: backport group inheritance fix
authoryoz <yoz@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 18 Sep 2012 08:58:51 +0000 (08:58 +0000)
committeryoz <yoz@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 18 Sep 2012 08:58:51 +0000 (08:58 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/edje-1.7@76788 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/bin/edje_cc_handlers.c

index a057416..f7fce79 100644 (file)
@@ -1066,6 +1066,8 @@ _edje_program_copy(Edje_Program *ep, Edje_Program *ep2)
           data_queue_copied_part_lookup(pc, &(et2->id), &(et->id));
         else if (ep2->action == EDJE_ACTION_TYPE_ACTION_STOP)
           data_queue_copied_program_lookup(pc, &(et2->id), &(et->id));
+        else if (ep2->action == EDJE_ACTION_TYPE_SCRIPT)
+          data_queue_copied_program_lookup(pc, &(et2->id), &(et->id));
         else if (ep2->action == EDJE_ACTION_TYPE_DRAG_VAL_SET)
           data_queue_copied_part_lookup(pc, &(et2->id), &(et->id));
         else if (ep2->action == EDJE_ACTION_TYPE_DRAG_VAL_STEP)
@@ -2517,6 +2519,7 @@ st_collections_group_inherit(void)
         cp->l2 = cp2->l2;
         cp->script = STRDUP(cp2->script);
         cd->is_lua = cd2->is_lua;
+        cd->shared = cd2->shared;
         cd->programs = eina_list_append(cd->programs, cp);
         data_queue_copied_anonymous_lookup(pc, &(cp2->id), &(cp->id));
      }