diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index 1b69676e54..54cf773149 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c @@ -157,14 +157,8 @@ _ecore_timer_legacy_tick(void *data, const Eo_Event *event) if (!_ecore_call_task_cb(legacy->func, (void*)legacy->data)) { - if (eo_key_data_get(event->obj, "_legacy")) - { - eo_key_del(event->obj, "_legacy"); - eo_event_callback_del(event->obj, EFL_TIMER_EVENT_TICK, - _ecore_timer_legacy_tick, legacy), - free(legacy); - eo_del(event->obj); - } + eo_del(event->obj); + free(legacy); } return EO_CALLBACK_CONTINUE; @@ -225,10 +219,8 @@ ecore_timer_del(Ecore_Timer *timer) legacy = eo_key_data_get(timer, "_legacy"); data = (void*) legacy->data; - eo_key_del(timer, "_legacy"); - eo_event_callback_del(timer, EFL_TIMER_EVENT_TICK, - _ecore_timer_legacy_tick, legacy), free(legacy); + eo_key_del(timer, "_legacy"); eo_del(timer); return data;