[EGIT] [core/elementary] master 07/14: elm_flipselector.c: ELM_SAFE_FREE adoption.

[Daniel Juyung Seo - Enlightenment Git]

seoz pushed a commit to branch master.

commit b65a10368b4885cc4bdcc2b574c2a47bc3911658
Author: Daniel Juyung Seo <seojuyu...@gmail.com>
Date:   Wed May 29 20:52:32 2013 +0900

    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.
---
 src/lib/elm_flipselector.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index 5fb0403..4f2ee2e 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -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);

-- 

------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1