seoz pushed a commit to branch master.

commit f8c37fbc38aa1202640473d9f959d59eb3cf3def
Author: Daniel Juyung Seo <[email protected]>
Date:   Wed May 29 20:50:14 2013 +0900

    elm_conform.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_conform.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 4463f70..0d95b3b 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -917,14 +917,14 @@ _elm_conformant_smart_del(Eo *obj, void *_pd, va_list 
*list EINA_UNUSED)
    Elm_Conformant_Smart_Data *sd = _pd;
 
 #ifdef HAVE_ELEMENTARY_X
-   ELM_FREE_FUNC(sd->prop_hdl, ecore_event_handler_del);
+   if (sd->prop_hdl) ecore_event_handler_del(sd->prop_hdl);
 #endif
 
-   ELM_FREE_FUNC(sd->show_region_job, ecore_job_del);
-   ELM_FREE_FUNC(sd->port_indi_timer, ecore_timer_del);
-   ELM_FREE_FUNC(sd->land_indi_timer, ecore_timer_del);
-   ELM_FREE_FUNC(sd->portrait_indicator, evas_object_del);
-   ELM_FREE_FUNC(sd->landscape_indicator, evas_object_del);
+   if (sd->show_region_job) ecore_job_del(sd->show_region_job);
+   if (sd->port_indi_timer) ecore_timer_del(sd->port_indi_timer);
+   if (sd->land_indi_timer) ecore_timer_del(sd->land_indi_timer);
+   if (sd->portrait_indicator) evas_object_del(sd->portrait_indicator);
+   if (sd->landscape_indicator) evas_object_del(sd->landscape_indicator);
 
    top = elm_widget_top_get(obj);
    evas_object_data_set(top, "\377 elm,conformant", NULL);

-- 

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

Reply via email to