seoz pushed a commit to branch master.
commit 19a93eff7182e8f2761ea511ddd7a018f9b680a6
Author: Daniel Juyung Seo <[email protected]>
Date: Wed May 29 20:54:30 2013 +0900
elm_gesture_layer.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_gesture_layer.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c
index f31231e..b2bd87d 100644
--- a/src/lib/elm_gesture_layer.c
+++ b/src/lib/elm_gesture_layer.c
@@ -1398,7 +1398,7 @@ _tap_gestures_test_reset(Gesture_Info *gesture)
EINA_SAFETY_ON_NULL_RETURN(gesture);
ELM_GESTURE_LAYER_DATA_GET(gesture->obj, sd);
- ELM_FREE_FUNC(sd->gest_taps_timeout, ecore_timer_del);
+ ELM_SAFE_FREE(sd->gest_taps_timeout, ecore_timer_del);
if (!gesture->data)
return;
@@ -1429,7 +1429,7 @@ _n_long_tap_test_reset(Gesture_Info *gesture)
free(p);
st->touched = NULL;
- ELM_FREE_FUNC(st->timeout, ecore_timer_del);
+ ELM_SAFE_FREE(st->timeout, ecore_timer_del);
memset(gesture->data, 0, sizeof(Long_Tap_Type));
}
@@ -1981,7 +1981,7 @@ _n_long_tap_test(Evas_Object *obj,
ev_flag = _state_set(gesture, ELM_GESTURE_STATE_ABORT,
&st->info, EINA_FALSE);
- ELM_FREE_FUNC(st->timeout, ecore_timer_del);
+ ELM_SAFE_FREE(st->timeout, ecore_timer_del);
_event_consume(sd, event_info, event_type, ev_flag);
}
@@ -2001,7 +2001,7 @@ _n_long_tap_test(Evas_Object *obj,
/* ABORT if user moved fingers out of tap area */
if (!_inside(x, y, st->center_x, st->center_y))
{
- ELM_FREE_FUNC(st->timeout, ecore_timer_del);
+ ELM_SAFE_FREE(st->timeout, ecore_timer_del);
/* Report MOVE if gesture started */
ev_flag = _state_set(gesture, ELM_GESTURE_STATE_ABORT,
@@ -3622,7 +3622,7 @@ _elm_gesture_layer_smart_del(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
free(sd->gesture[i]);
}
- ELM_FREE_FUNC(sd->gest_taps_timeout, ecore_timer_del);
+ if (sd->gest_taps_timeout) ecore_timer_del(sd->gest_taps_timeout);
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
