Can you backport this to elm 1.7 branch? Daniel Juyung Seo (SeoZ) On Jan 3, 2013 6:53 PM, "Enlightenment SVN" <[email protected]> wrote:
> Log: > Fix the bug which the callbacks of the sub-object are added even if the > sub-object is already added the parent object. > > > Author: jaehwan > Date: 2013-01-03 01:52:57 -0800 (Thu, 03 Jan 2013) > New Revision: 82053 > Trac: http://trac.enlightenment.org/e/changeset/82053 > > Modified: > trunk/elementary/ChangeLog trunk/elementary/NEWS > trunk/elementary/src/lib/elm_flip.c trunk/elementary/src/lib/elm_hover.c > trunk/elementary/src/lib/elm_layout.c > > Modified: trunk/elementary/ChangeLog > =================================================================== > --- trunk/elementary/ChangeLog 2013-01-03 09:31:33 UTC (rev 82052) > +++ trunk/elementary/ChangeLog 2013-01-03 09:52:57 UTC (rev 82053) > @@ -874,3 +874,7 @@ > 2013-01-03 Thiep Ha > > * Fix list separator size bug. > + > +2013-01-03 Jaehwan Kim > + > + * Fix the bug which the callbacks of the sub-object are added > even if the sub-object is added the parent object. > > Modified: trunk/elementary/NEWS > =================================================================== > --- trunk/elementary/NEWS 2013-01-03 09:31:33 UTC (rev 82052) > +++ trunk/elementary/NEWS 2013-01-03 09:52:57 UTC (rev 82053) > @@ -109,6 +109,7 @@ > * Tooltips now correctly set NETWM tooltip window type > * Fix the naviframe item part text to be set properly. > * Fix list separator size bug. > + * Fix the bug which the callbacks of the sub-object are added even if > the sub-object is added the parent object. > > Removals: > > > Modified: trunk/elementary/src/lib/elm_flip.c > =================================================================== > --- trunk/elementary/src/lib/elm_flip.c 2013-01-03 09:31:33 UTC (rev 82052) > +++ trunk/elementary/src/lib/elm_flip.c 2013-01-03 09:52:57 UTC (rev 82053) > @@ -144,6 +144,9 @@ > Eina_Bool int_ret; > if (ret) *ret = EINA_FALSE; > > + if (evas_object_data_get(sobj, "elm-parent") == obj) > + goto end; > + > eo_do_super(obj, elm_wdg_sub_object_add(sobj, &int_ret)); > if (!int_ret) return; > > @@ -152,6 +155,7 @@ > evas_object_event_callback_add > (sobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints_cb, > obj); > > +end: > if (ret) *ret = EINA_TRUE; > } > > > Modified: trunk/elementary/src/lib/elm_hover.c > =================================================================== > --- trunk/elementary/src/lib/elm_hover.c 2013-01-03 09:31:33 UTC > (rev 82052) > +++ trunk/elementary/src/lib/elm_hover.c 2013-01-03 09:52:57 UTC > (rev 82053) > @@ -331,6 +331,9 @@ > Eina_Bool int_ret; > Elm_Hover_Smart_Data *sd = _pd; > > + if (evas_object_data_get(sobj, "elm-parent") == obj) > + goto end; > + > eo_do_super(obj, elm_wdg_sub_object_add(sobj, &int_ret)); > if (!int_ret) return; > > @@ -338,6 +341,7 @@ > evas_object_event_callback_add > (sobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_smt_sub_changed, obj); > > +end: > if (ret) *ret = EINA_TRUE; > } > > > Modified: trunk/elementary/src/lib/elm_layout.c > =================================================================== > --- trunk/elementary/src/lib/elm_layout.c 2013-01-03 09:31:33 UTC > (rev 82052) > +++ trunk/elementary/src/lib/elm_layout.c 2013-01-03 09:52:57 UTC > (rev 82053) > @@ -418,9 +418,11 @@ > Evas_Object *sobj = va_arg(*list, Evas_Object *); > Eina_Bool *ret = va_arg(*list, Eina_Bool *); > if (ret) *ret = EINA_FALSE; > - > Eina_Bool int_ret = EINA_FALSE; > > + if (evas_object_data_get(sobj, "elm-parent") == obj) > + goto end; > + > eo_do_super(obj, elm_wdg_sub_object_add(sobj, &int_ret)); > if (!int_ret) return; > > @@ -432,6 +434,7 @@ > (sobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, > _on_sub_object_size_hint_change, obj); > > +end: > if (ret) *ret = EINA_TRUE; > } > > > > > ------------------------------------------------------------------------------ > Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, > MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current > with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft > MVPs and experts. ON SALE this month only -- learn more at: > http://p.sf.net/sfu/learnmore_122712 > _______________________________________________ > enlightenment-svn mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnmore_122712 _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
