cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=85f8661f456df2460aa9a2715023388a82e43e3c
commit 85f8661f456df2460aa9a2715023388a82e43e3c
Author: Vorobiov Vitalii <vi.vorob...@samsung.com>
Date: Tue Apr 1 19:09:32 2014 +0900
edje_cc: fix group inheriting with scripts. (group.script and
.program.script)
After doing some edje_edit manipulations there was a problem that
after edje_decc of changed EDJ file it wasnt able to compile again, because
some of scripts
weren't inherited.
The problem was in Code and Code_Script structure.
There is "shared" ("script") field and "original" field that contained a
string with embryo script code.
After inheriting whole group, "original" field wasn't copied, so it wasn't
able to write
the script into resulted EDJ file (look at edje_cc_out:1407).
@fix
Reviewers: cedric, seoz, raster
Reviewed By: cedric
CC: reutskiy.v.v, cedric
Differential Revision: https://phab.enlightenment.org/D671
Signed-off-by: Cedric BAIL <cedric.b...@free.fr>
---
src/bin/edje/edje_cc_handlers.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 477f9fc..740c53f 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -2979,8 +2979,10 @@ st_collections_group_inherit(void)
cp->l1 = cp2->l1;
cp->l2 = cp2->l2;
cp->script = STRDUP(cp2->script);
+ cp->original = STRDUP(cp2->original);
cd->is_lua = cd2->is_lua;
cd->shared = cd2->shared;
+ cd->original = cd2->original;
cd->programs = eina_list_append(cd->programs, cp);
data_queue_copied_anonymous_lookup(pc, &(cp2->id), &(cp->id));
}
--
