seoz pushed a commit to branch master.
commit b7380a281d6362d9a7159cc350225ddc49ee1066
Author: Daniel Juyung Seo <[email protected]>
Date: Wed May 29 20:47:36 2013 +0900
elm_colorselector.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_colorselector.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 6c8551b..bedf184 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1284,7 +1284,7 @@ _on_color_pressed(void *data,
elm_object_signal_emit(VIEW(item), "elm,state,selected", "elm");
sd->longpressed = EINA_FALSE;
- ELM_FREE_FUNC(sd->longpress_timer, ecore_timer_del);
+ if (sd->longpress_timer) ecore_timer_del(sd->longpress_timer);
sd->longpress_timer = ecore_timer_add
(_elm_config->longpress_timeout, _on_color_long_press, data);
}
@@ -1304,7 +1304,7 @@ _on_color_released(void *data,
ELM_COLORSELECTOR_DATA_GET(WIDGET(item), sd);
if (ev->button != 1) return;
- ELM_FREE_FUNC(sd->longpress_timer, ecore_timer_del);
+ ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
elm_object_signal_emit(VIEW(item), "elm,state,unselected", "elm");
if (!sd->longpressed)
{
@@ -1559,12 +1559,13 @@ _elm_colorselector_smart_del(Eo *obj, void *_pd,
va_list *list EINA_UNUSED)
evas_event_callback_del_full(evas_object_evas_get(obj),
EVAS_CALLBACK_CANVAS_FOCUS_IN, _mouse_in_canvas, obj);
evas_event_callback_del_full(evas_object_evas_get(obj),
EVAS_CALLBACK_CANVAS_FOCUS_OUT, _mouse_out_canvas, obj);
- ELM_FREE_FUNC(sd->longpress_timer, ecore_timer_del);
- ELM_FREE_FUNC(sd->palette_name, eina_stringshare_del);
+ if (sd->longpress_timer) ecore_timer_del(sd->longpress_timer);
+ if (sd->palette_name) eina_stringshare_del(sd->palette_name);
+
#ifdef HAVE_ELEMENTARY_X
- ELM_FREE_FUNC(sd->grab.mouse_motion, ecore_event_handler_del);
- ELM_FREE_FUNC(sd->grab.mouse_up, ecore_event_handler_del);
- ELM_FREE_FUNC(sd->grab.key_up, ecore_event_handler_del);
+ if (sd->grab.mouse_motion) ecore_event_handler_del(sd->grab.mouse_motion);
+ if (sd->grab.mouse_up) ecore_event_handler_del(sd->grab.mouse_up);
+ if (sd->grab.key_up) ecore_event_handler_del(sd->grab.key_up);
#endif
_items_del(sd);
--
------------------------------------------------------------------------------
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
