elm_notify.c: ELM_SAFE_FREE adoption.
authorDaniel Juyung Seo <seojuyung2@gmail.com>
Wed, 29 May 2013 12:04:49 +0000 (21:04 +0900)
committerDaniel Juyung Seo <seojuyung2@gmail.com>
Wed, 29 May 2013 12:04:49 +0000 (21:04 +0900)
I splited ELM_SAFE_FREE refactoring patches. One commit per each file as recommended.
For the detail, please refer 3072dab12f12fe83fb5a628d15efd5cded11787f.

src/lib/elm_notify.c

index 7a1f1f8..f56d93a 100644 (file)
@@ -259,7 +259,7 @@ static void
 _timer_init(Evas_Object *obj,
             Elm_Notify_Smart_Data *sd)
 {
-   ELM_FREE_FUNC(sd->timer, ecore_timer_del);
+   if (sd->timer) ecore_timer_del(sd->timer);
    if (sd->timeout > 0.0)
      sd->timer = ecore_timer_add(sd->timeout, _timer_cb, obj);
 }
@@ -286,7 +286,7 @@ _elm_notify_smart_hide(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    evas_object_hide(sd->notify);
    if (!sd->allow_events) evas_object_hide(sd->block_events);
-   ELM_FREE_FUNC(sd->timer, ecore_timer_del);
+   ELM_SAFE_FREE(sd->timer, ecore_timer_del);
 }
 
 static void
@@ -458,7 +458,7 @@ _elm_notify_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    elm_notify_parent_set(obj, NULL);
    elm_notify_allow_events_set(obj, EINA_FALSE);
-   ELM_FREE_FUNC(sd->timer, ecore_timer_del);
+   if (sd->timer) ecore_timer_del(sd->timer);
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
 }