From 2f5ef21462493841aac0f80720c50d7f8a89fd0a Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Wed, 29 May 2013 21:07:24 +0900 Subject: [PATCH] elm_spinner.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. --- legacy/elementary/src/lib/elm_spinner.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c index adf3c4590b..1a8a622dab 100644 --- a/legacy/elementary/src/lib/elm_spinner.c +++ b/legacy/elementary/src/lib/elm_spinner.c @@ -146,7 +146,7 @@ _value_set(Evas_Object *obj, sd->val = new_val; evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); - ELM_FREE_FUNC(sd->delay, ecore_timer_del); + if (sd->delay) ecore_timer_del(sd->delay); sd->delay = ecore_timer_add(0.2, _delay_change, obj); return EINA_TRUE; @@ -309,7 +309,7 @@ _val_inc_start(Evas_Object *obj) sd->interval = sd->first_interval; sd->spin_speed = sd->step; - ELM_FREE_FUNC(sd->spin, ecore_timer_del); + if (sd->spin) ecore_timer_del(sd->spin); sd->spin = ecore_timer_add(sd->interval, _spin_value, obj); _spin_value(obj); } @@ -321,7 +321,7 @@ _val_inc_stop(Evas_Object *obj) sd->interval = sd->first_interval; sd->spin_speed = 0; - ELM_FREE_FUNC(sd->spin, ecore_timer_del); + ELM_SAFE_FREE(sd->spin, ecore_timer_del); } static void @@ -331,7 +331,7 @@ _val_dec_start(Evas_Object *obj) sd->interval = sd->first_interval; sd->spin_speed = -sd->step; - ELM_FREE_FUNC(sd->spin, ecore_timer_del); + if (sd->spin) ecore_timer_del(sd->spin); sd->spin = ecore_timer_add(sd->interval, _spin_value, obj); _spin_value(obj); } @@ -343,7 +343,7 @@ _val_dec_stop(Evas_Object *obj) sd->interval = sd->first_interval; sd->spin_speed = 0; - ELM_FREE_FUNC(sd->spin, ecore_timer_del); + ELM_SAFE_FREE(sd->spin, ecore_timer_del); } static void @@ -405,7 +405,7 @@ _entry_activated_cb(void *data, _entry_value_apply(data); evas_object_smart_callback_call(data, SIG_CHANGED, NULL); - ELM_FREE_FUNC(sd->delay, ecore_timer_del); + if (sd->delay) ecore_timer_del(sd->delay); sd->delay = ecore_timer_add(0.2, _delay_change, data); } @@ -692,9 +692,9 @@ _elm_spinner_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED) Elm_Spinner_Smart_Data *sd = _pd; - ELM_FREE_FUNC(sd->label, eina_stringshare_del); - ELM_FREE_FUNC(sd->delay, ecore_timer_del); - ELM_FREE_FUNC(sd->spin, ecore_timer_del); + if (sd->label) eina_stringshare_del(sd->label); + if (sd->delay) ecore_timer_del(sd->delay); + if (sd->spin) ecore_timer_del(sd->spin); if (sd->special_values) {