since this is in the e19 release cycle, commits which fix bugs should be prefixed by "bugfix:" and then the fix. no other prefixing here.
On Mon, 30 Dec 2013 00:00:10 -0800 Carsten Haitzler <ras...@rasterman.com> wrote: > raster pushed a commit to branch master. > > http://git.enlightenment.org/core/enlightenment.git/commit/?id=00050ffca8b18206f47fb0c877b001b334118400 > > commit 00050ffca8b18206f47fb0c877b001b334118400 > Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> > Date: Mon Dec 30 17:00:29 2013 +0900 > > livethumb - fix problem where e canvas list didnt del the livethumb ee > --- > src/bin/e_livethumb.c | 10 ++++++---- > src/bin/e_win.c | 3 ++- > 2 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/src/bin/e_livethumb.c b/src/bin/e_livethumb.c > index 96d4af4..b7e4d7c 100644 > --- a/src/bin/e_livethumb.c > +++ b/src/bin/e_livethumb.c > @@ -14,6 +14,7 @@ struct _E_Smart_Data > Evas_Object *evas_obj; > Evas_Object *thumb_obj; > Evas *evas; > + Ecore_Evas *ee; > Evas_Coord vw, vh; > }; > > @@ -135,18 +136,19 @@ _e_smart_add(Evas_Object *obj) > sd->vh = 1; > > sd->evas_obj = > ecore_evas_object_image_new(ecore_evas_ecore_evas_get(evas_object_evas_get(obj))); > - ecore_evas_alpha_set(evas_object_data_get(sd->evas_obj, "Ecore_Evas"), 1); > + sd->ee = evas_object_data_get(sd->evas_obj, "Ecore_Evas"); > + ecore_evas_alpha_set(sd->ee, 1); > evas_object_smart_member_add(sd->evas_obj, obj); > evas_object_image_size_set(sd->evas_obj, sd->vw, sd->vh); > - sd->evas = ecore_evas_get(evas_object_data_get(sd->evas_obj, > "Ecore_Evas")); > - e_canvas_add(evas_object_data_get(sd->evas_obj, "Ecore_Evas")); > + sd->evas = ecore_evas_get(sd->ee); > + e_canvas_add(sd->ee); > } > > static void > _e_smart_del(Evas_Object *obj) > { > INTERNAL_ENTRY; > - e_canvas_del(evas_object_data_get(sd->evas_obj, "Ecore_Evas")); > + e_canvas_del(sd->ee); > evas_object_del(sd->evas_obj); > free(sd); > } > diff --git a/src/bin/e_win.c b/src/bin/e_win.c > index 623a949..a93f229 100644 > --- a/src/bin/e_win.c > +++ b/src/bin/e_win.c > @@ -326,7 +326,8 @@ e_win_show(E_Win *win) > if (!win->placed) > win->border->re_manage = 0; > win->border->internal = 1; > - win->border->internal_ecore_evas = win->ecore_evas; > + if (win->ecore_evas) > + win->border->internal_ecore_evas = win->ecore_evas; > if (win->state.no_remember) win->border->internal_no_remember = 1; > win->border->internal_no_reopen = win->state.no_reopen; > } > ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
