seoz pushed a commit to branch master.
commit 889f86f2ce41f5f17e2d75239111959f78873541
Author: Daniel Juyung Seo <[email protected]>
Date: Wed May 29 21:04:49 2013 +0900
elm_notify.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_notify.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 7a1f1f8..f56d93a 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -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());
}
--
------------------------------------------------------------------------------
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
