forked from enlightenment/efl
elm_flipselector.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
2bbc41d4ae
commit
df2b288846
|
@ -454,7 +454,7 @@ _elm_flipselector_smart_event(Eo *obj, void *_pd, va_list *list)
|
|||
else if ((strcmp(ev->keyname, "Up")) && (strcmp(ev->keyname, "KP_Up")))
|
||||
return;
|
||||
|
||||
ELM_FREE_FUNC(sd->spin, ecore_timer_del);
|
||||
ELM_SAFE_FREE(sd->spin, ecore_timer_del);
|
||||
|
||||
/* TODO: if direction setting via API is not coming in, replace
|
||||
these calls by flip_{next,prev} */
|
||||
|
@ -498,7 +498,7 @@ _signal_val_up_start(void *data,
|
|||
|
||||
sd->interval = sd->first_interval;
|
||||
|
||||
ELM_FREE_FUNC(sd->spin, ecore_timer_del);
|
||||
if (sd->spin) ecore_timer_del(sd->spin);
|
||||
sd->spin = ecore_timer_add(sd->interval, _signal_val_up, data);
|
||||
|
||||
_signal_val_up(data);
|
||||
|
@ -531,7 +531,7 @@ _signal_val_down_start(void *data,
|
|||
|
||||
sd->interval = sd->first_interval;
|
||||
|
||||
ELM_FREE_FUNC(sd->spin, ecore_timer_del);
|
||||
if (sd->spin) ecore_timer_del(sd->spin);
|
||||
sd->spin = ecore_timer_add(sd->interval, _signal_val_down, data);
|
||||
|
||||
_signal_val_down(data);
|
||||
|
@ -545,7 +545,7 @@ _signal_val_change_stop(void *data,
|
|||
{
|
||||
ELM_FLIPSELECTOR_DATA_GET(data, sd);
|
||||
|
||||
ELM_FREE_FUNC(sd->spin, ecore_timer_del);
|
||||
ELM_SAFE_FREE(sd->spin, ecore_timer_del);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -587,7 +587,7 @@ _elm_flipselector_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
while (sd->items)
|
||||
elm_widget_item_del(DATA_GET(sd->items));
|
||||
|
||||
ELM_FREE_FUNC(sd->spin, ecore_timer_del);
|
||||
if (sd->spin) ecore_timer_del(sd->spin);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
|
||||
}
|
||||
|
@ -626,7 +626,7 @@ _flip_next(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED)
|
|||
{
|
||||
Elm_Flipselector_Smart_Data *sd = _pd;
|
||||
|
||||
ELM_FREE_FUNC(sd->spin, ecore_timer_del);
|
||||
ELM_SAFE_FREE(sd->spin, ecore_timer_del);
|
||||
|
||||
_flipselector_walk(sd);
|
||||
_flip_down(sd);
|
||||
|
@ -645,7 +645,7 @@ _flip_prev(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED)
|
|||
{
|
||||
Elm_Flipselector_Smart_Data *sd = _pd;
|
||||
|
||||
ELM_FREE_FUNC(sd->spin, ecore_timer_del);
|
||||
ELM_SAFE_FREE(sd->spin, ecore_timer_del);
|
||||
|
||||
_flipselector_walk(sd);
|
||||
_flip_up(sd);
|
||||
|
|
Loading…
Reference in New Issue