diff options
| author | Vorobiov Vitalii <vi.vorobiov@samsung.com> | 2014-04-01 19:09:32 +0900 |
|---|---|---|
| committer | Cedric BAIL <cedric.bail@free.fr> | 2014-04-01 19:49:09 +0900 |
| commit | 0a766b91c56ae13c932dfd89f4616f0464e0cac7 (patch) | |
| tree | 83b91d0514282535ca0b96b2bf57e0ee8f5a29d9 | |
| parent | 763c0c79df30ccbdb6ec803ddefa4bd36c176ec3 (diff) | |
| download | efl-0a766b91c56ae13c932dfd89f4616f0464e0cac7.tar.gz | |
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.bail@free.fr>
| -rw-r--r-- | src/bin/edje/edje_cc_handlers.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 477f9fc749..740c53f898 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)); } |