From 9a7bbbf3be52eeb1514cf5e471a03e55058b25d4 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Wed, 29 May 2013 20:56:07 +0900 Subject: [PATCH] elm_image.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_image.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/legacy/elementary/src/lib/elm_image.c b/legacy/elementary/src/lib/elm_image.c index 517485adf1..7b09da9287 100644 --- a/legacy/elementary/src/lib/elm_image.c +++ b/legacy/elementary/src/lib/elm_image.c @@ -664,9 +664,9 @@ _elm_image_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED) { Elm_Image_Smart_Data *sd = _pd; - ELM_FREE_FUNC(sd->anim_timer, ecore_timer_del); - ELM_FREE_FUNC(sd->img, evas_object_del); - ELM_FREE_FUNC(sd->prev_img, evas_object_del); + if (sd->anim_timer) ecore_timer_del(sd->anim_timer); + if (sd->img) evas_object_del(sd->img); + if (sd->prev_img) evas_object_del(sd->prev_img); eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); } @@ -1509,7 +1509,7 @@ _elm_image_smart_animated_play_set(Eo *obj, void *_pd, va_list *list) } else { - ELM_FREE_FUNC(sd->anim_timer, ecore_timer_del); + ELM_SAFE_FREE(sd->anim_timer, ecore_timer_del); } sd->play = play; }