From b54fb12f8b9e37f5a899e8f300f956259c74a916 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Wed, 29 May 2013 20:50:14 +0900 Subject: [PATCH] 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. --- legacy/elementary/src/lib/elm_conform.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/legacy/elementary/src/lib/elm_conform.c b/legacy/elementary/src/lib/elm_conform.c index 4463f70726..0d95b3b1c0 100644 --- a/legacy/elementary/src/lib/elm_conform.c +++ b/legacy/elementary/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);