On Fri, Mar 18, 2016 at 7:17 AM, Amitesh Singh <[email protected]> wrote:
> Hello > > On Mar 18, 2016 2:11 AM, "Jee-Yong Um" <[email protected]> wrote: > > > > cedric pushed a commit to branch master. > > > > > http://git.enlightenment.org/core/efl.git/commit/?id=37408aef95ee5794f9030ece34be9d6b097d064e > > > > commit 37408aef95ee5794f9030ece34be9d6b097d064e > > Author: Jee-Yong Um <[email protected]> > > Date: Thu Mar 17 11:13:10 2016 -0700 > > > > edje: remove unnecessary repetition during copying code > > > > Summary: Code doesn't need to be copied every time when program is > copied. > > > > Reviewers: cedric > > > > Reviewed By: cedric > > > > Subscribers: jpeg > > > > Differential Revision: https://phab.enlightenment.org/D3799 > > > > Signed-off-by: Cedric BAIL <[email protected]> > > --- > > src/bin/edje/edje_cc_handlers.c | 7 ++++--- > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/src/bin/edje/edje_cc_handlers.c > b/src/bin/edje/edje_cc_handlers.c > > index 8fb43cf..5c6f14d 100644 > > --- a/src/bin/edje/edje_cc_handlers.c > > +++ b/src/bin/edje/edje_cc_handlers.c > > @@ -4438,6 +4438,10 @@ 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)); > > @@ -4446,9 +4450,6 @@ 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)); > > } > > > > -- > > This breaks the compilation of elementary theme for me. > Please check. > > > > $ make Making all in themes make[1]: Entering directory '/home/ami/EFL/core/elementary/data/themes' EDJ default.edj edje_cc: Error. parse error ../../data/themes/edc/comp_effects.edc:215. There is already an existing script section for the group Makefile:1579: recipe for target 'default.edj' failed make[1]: *** [default.edj] Error 255 make[1]: Leaving directory '/home/ami/EFL/core/elementary/data/themes' Makefile:444: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 > > > ------------------------------------------------------------------------------ Transform Data into Opportunity. Accelerate data analysis in your applications with Intel Data Analytics Acceleration Library. Click to learn more. http://pubads.g.doubleclick.net/gampad/clk?id=278785231&iu=/4140 _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
