From d567f121fff0c809097844410e3d9a448796d523 Mon Sep 17 00:00:00 2001
From: Daniel Juyung Seo <seojuyung2@gmail.com>
Date: Wed, 29 May 2013 20:41:37 +0900
Subject: [PATCH] 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.
---
 legacy/elementary/src/lib/elm_calendar.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/legacy/elementary/src/lib/elm_calendar.c b/legacy/elementary/src/lib/elm_calendar.c
index 04a59cff9d..26a5683540 100644
--- a/legacy/elementary/src/lib/elm_calendar.c
+++ b/legacy/elementary/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)
      {