forked from enlightenment/efl
elm_clock.c: ELM_SAFE_FREE adoption.
I splited ELM_SAFE_FREE refactoring patches. One commit per each file as recommended. For the detail, please refer 3072dab12f12fe83fb5a628d15efd5cded11787f.
This commit is contained in:
parent
d567f121ff
commit
602b04c578
|
@ -142,7 +142,7 @@ _on_clock_val_up_start(void *data,
|
|||
|
||||
sd->interval = sd->first_interval;
|
||||
sd->sel_obj = obj;
|
||||
ELM_FREE_FUNC(sd->spin, ecore_timer_del);
|
||||
if (sd->spin) ecore_timer_del(sd->spin);
|
||||
sd->spin = ecore_timer_add(sd->interval, _on_clock_val_up, data);
|
||||
|
||||
_on_clock_val_up(data);
|
||||
|
@ -158,7 +158,7 @@ _on_clock_val_down_start(void *data,
|
|||
|
||||
sd->interval = sd->first_interval;
|
||||
sd->sel_obj = obj;
|
||||
ELM_FREE_FUNC(sd->spin, ecore_timer_del);
|
||||
if (sd->spin) ecore_timer_del(sd->spin);
|
||||
sd->spin = ecore_timer_add(sd->interval, _on_clock_val_down, data);
|
||||
|
||||
_on_clock_val_down(data);
|
||||
|
@ -172,7 +172,7 @@ _on_clock_val_change_stop(void *data,
|
|||
{
|
||||
ELM_CLOCK_DATA_GET(data, sd);
|
||||
|
||||
ELM_FREE_FUNC(sd->spin, ecore_timer_del);
|
||||
ELM_SAFE_FREE(sd->spin, ecore_timer_del);
|
||||
sd->sel_obj = NULL;
|
||||
}
|
||||
|
||||
|
@ -712,8 +712,8 @@ _elm_clock_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
{
|
||||
Elm_Clock_Smart_Data *sd = _pd;
|
||||
|
||||
ELM_FREE_FUNC(sd->ticker, ecore_timer_del);
|
||||
ELM_FREE_FUNC(sd->spin, ecore_timer_del);
|
||||
if (sd->ticker) ecore_timer_del(sd->ticker);
|
||||
if (sd->spin) ecore_timer_del(sd->spin);
|
||||
|
||||
/* NB: digits are killed for being sub objects, automatically */
|
||||
|
||||
|
|
Loading…
Reference in New Issue