[EGIT] [core/elementary] master 07/07: elm_calendar.c: ELM_SAFE_FREE adoption for calendar.

[Daniel Juyung Seo - Enlightenment Git]

seoz pushed a commit to branch master.

commit 853b28ebbeca1818bdfe93fc07c9db31c9c672bb
Author: Daniel Juyung Seo <seojuyu...@gmail.com>
Date:   Wed May 29 20:41:37 2013 +0900

    elm_calendar.c: ELM_SAFE_FREE adoption for calendar.
    
    I splited ELM_SAFE_FREE refactoring patches. One commit per each file as 
recommended.
    For the detail, please refer 3072dab12f12fe83fb5a628d15efd5cded11787f.
---
 src/lib/elm_calendar.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 04a59cf..26a5683 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -672,7 +672,7 @@ _button_month_inc_start(void *data,
 
    sd->interval = sd->first_interval;
    sd->spin_speed = 1;
-   ELM_FREE_FUNC(sd->spin_month, ecore_timer_del);
+   if (sd->spin_month) ecore_timer_del(sd->spin_month);
    sd->spin_month = ecore_timer_add(sd->interval, _spin_month_value, data);
 
    _spin_month_value(data);
@@ -688,7 +688,7 @@ _button_month_dec_start(void *data,
 
    sd->interval = sd->first_interval;
    sd->spin_speed = -1;
-   ELM_FREE_FUNC(sd->spin_month, ecore_timer_del);
+   if (sd->spin_month) ecore_timer_del(sd->spin_month);
    sd->spin_month = ecore_timer_add(sd->interval, _spin_month_value, data);
 
    _spin_month_value(data);
@@ -703,7 +703,7 @@ _button_month_stop(void *data,
    ELM_CALENDAR_DATA_GET(data, sd);
 
    sd->interval = sd->first_interval;
-   ELM_FREE_FUNC(sd->spin_month, ecore_timer_del);
+   ELM_SAFE_FREE(sd->spin_month, ecore_timer_del);
 }
 
 static void
@@ -716,7 +716,7 @@ _button_year_inc_start(void *data,
 
    sd->interval = sd->first_interval;
    sd->spin_speed = 1;
-   ELM_FREE_FUNC(sd->spin_year, ecore_timer_del);
+   if (sd->spin_year) ecore_timer_del(sd->spin_year);
    sd->spin_year = ecore_timer_add(sd->interval, _spin_year_value, data);
 
    _spin_year_value(data);
@@ -732,7 +732,7 @@ _button_year_dec_start(void *data,
 
    sd->interval = sd->first_interval;
    sd->spin_speed = -1;
-   ELM_FREE_FUNC(sd->spin_year, ecore_timer_del);
+   if (sd->spin_year) ecore_timer_del(sd->spin_year);
    sd->spin_year = ecore_timer_add(sd->interval, _spin_year_value, data);
 
    _spin_year_value(data);
@@ -747,7 +747,7 @@ _button_year_stop(void *data,
    ELM_CALENDAR_DATA_GET(data, sd);
 
    sd->interval = sd->first_interval;
-   ELM_FREE_FUNC(sd->spin_year, ecore_timer_del);
+   ELM_SAFE_FREE(sd->spin_year, ecore_timer_del);
 }
 
 static int
@@ -1028,9 +1028,9 @@ _elm_calendar_smart_del(Eo *obj, void *_pd, va_list *list 
EINA_UNUSED)
    Elm_Calendar_Mark *mark;
    Elm_Calendar_Smart_Data *sd = _pd;
 
-   ELM_FREE_FUNC(sd->spin_month, ecore_timer_del);
-   ELM_FREE_FUNC(sd->spin_year, ecore_timer_del);
-   ELM_FREE_FUNC(sd->update_timer, ecore_timer_del);
+   if (sd->spin_month) ecore_timer_del(sd->spin_month);
+   if (sd->spin_year) ecore_timer_del(sd->spin_year);
+   if (sd->update_timer) ecore_timer_del(sd->update_timer);
 
    if (sd->marks)
      {

-- 

------------------------------------------------------------------------------
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