Wouldnt it be simpler to put this in ecore timer del itself. On Mar 30, 2012 9:31 PM, "Enlightenment SVN" <no-re...@enlightenment.org> wrote:
> Log: > elm: Set timer/animator to NULL after they're deleted. > > Author: seoz > Date: 2012-03-30 05:31:11 -0700 (Fri, 30 Mar 2012) > New Revision: 69796 > Trac: http://trac.enlightenment.org/e/changeset/69796 > > Modified: > trunk/elementary/src/lib/elm_flipselector.c > trunk/elementary/src/lib/elm_index.c trunk/elementary/src/lib/elm_list.c > trunk/elementary/src/lib/elm_slideshow.c > > Modified: trunk/elementary/src/lib/elm_flipselector.c > =================================================================== > --- trunk/elementary/src/lib/elm_flipselector.c 2012-03-30 12:31:01 UTC > (rev 69795) > +++ trunk/elementary/src/lib/elm_flipselector.c 2012-03-30 12:31:11 UTC > (rev 69796) > @@ -324,6 +324,7 @@ > return EINA_FALSE; > > if (wd->spin) ecore_timer_del(wd->spin); > + wd->spin = NULL; > > /* TODO: if direction setting via API is not coming in, replace > these calls by flip_{next,prev} */ > @@ -663,6 +664,7 @@ > if (!wd) return; > > if (wd->spin) ecore_timer_del(wd->spin); > + wd->spin = NULL; > > _flipselector_walk(wd); > _flip_down(wd); > @@ -678,6 +680,7 @@ > if (!wd) return; > > if (wd->spin) ecore_timer_del(wd->spin); > + wd->spin = NULL; > > _flipselector_walk(wd); > _flip_up(wd); > > Modified: trunk/elementary/src/lib/elm_index.c > =================================================================== > --- trunk/elementary/src/lib/elm_index.c 2012-03-30 12:31:01 UTC > (rev 69795) > +++ trunk/elementary/src/lib/elm_index.c 2012-03-30 12:31:11 UTC > (rev 69796) > @@ -70,6 +70,7 @@ > elm_widget_item_free(it); > } > if (wd->delay) ecore_timer_del(wd->delay); > + wd->delay = NULL; > } > > static void > > Modified: trunk/elementary/src/lib/elm_list.c > =================================================================== > --- trunk/elementary/src/lib/elm_list.c 2012-03-30 12:31:01 UTC (rev 69795) > +++ trunk/elementary/src/lib/elm_list.c 2012-03-30 12:31:11 UTC (rev 69796) > @@ -133,7 +133,9 @@ > eina_stringshare_del(it->label); > > if (it->swipe_timer) ecore_timer_del(it->swipe_timer); > + it->swipe_timer = NULL; > if (it->long_timer) ecore_timer_del(it->long_timer); > + it->long_timer = NULL; > if (it->icon) evas_object_del(it->icon); > if (it->end) evas_object_del(it->end); > } > > Modified: trunk/elementary/src/lib/elm_slideshow.c > =================================================================== > --- trunk/elementary/src/lib/elm_slideshow.c 2012-03-30 12:31:01 UTC > (rev 69795) > +++ trunk/elementary/src/lib/elm_slideshow.c 2012-03-30 12:31:11 UTC > (rev 69796) > @@ -494,6 +494,7 @@ > _end(WIDGET(item), WIDGET(item), NULL, NULL); > > if (wd->timer) ecore_timer_del(wd->timer); > + wd->timer = NULL; > if (wd->timeout > 0.0) > wd->timer = ecore_timer_add(wd->timeout, _timer_cb, WIDGET(item)); > _item_realize(next); > @@ -523,6 +524,7 @@ > _end(obj, obj, NULL, NULL); > > if (wd->timer) ecore_timer_del(wd->timer); > + wd->timer = NULL; > if (wd->timeout > 0.0) > wd->timer = ecore_timer_add(wd->timeout, _timer_cb, obj); > > @@ -556,6 +558,7 @@ > _end(obj, obj, NULL, NULL); > > if (wd->timer) ecore_timer_del(wd->timer); > + wd->timer = NULL; > if (wd->timeout > 0.0) > wd->timer = ecore_timer_add(wd->timeout, _timer_cb, obj); > > > > > ------------------------------------------------------------------------------ > This SF email is sponsosred by: > Try Windows Azure free for 90 days Click Here > http://p.sf.net/sfu/sfd2d-msazure > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > ------------------------------------------------------------------------------ This SF email is sponsosred by: Try Windows Azure free for 90 days Click Here http://p.sf.net/sfu/sfd2d-msazure _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
