From a7b1329b0efb6997808708fb9a3cdbe4a867ba39 Mon Sep 17 00:00:00 2001 From: Daniel Hirt Date: Thu, 15 Nov 2018 10:52:16 +0200 Subject: [PATCH] Scroll manager: remove unnecessary callback_del Child objects are already destoryed during destruction of the parent object. This fixes ERR messages when doing operations on the `event_rect` object, which is already destroyed at that point. --- src/lib/elementary/efl_ui_scroll_manager.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c index 37943e9a04..4b35cf8abd 100644 --- a/src/lib/elementary/efl_ui_scroll_manager.c +++ b/src/lib/elementary/efl_ui_scroll_manager.c @@ -1947,25 +1947,6 @@ _scroll_event_object_attach(Evas_Object *obj) _efl_ui_scroll_manager_mouse_move_event_cb, sd); } -static void -_scroll_event_object_detach(Evas_Object *obj) -{ - EFL_UI_SCROLL_MANAGER_DATA_GET_OR_RETURN(obj, sd); - - evas_object_event_callback_del_full - (sd->event_rect, EVAS_CALLBACK_MOUSE_WHEEL, _efl_ui_scroll_manager_wheel_event_cb, - sd); - evas_object_event_callback_del_full - (sd->event_rect, EVAS_CALLBACK_MOUSE_DOWN, - _efl_ui_scroll_manager_mouse_down_event_cb, sd); - evas_object_event_callback_del_full - (sd->event_rect, EVAS_CALLBACK_MOUSE_UP, - _efl_ui_scroll_manager_mouse_up_event_cb, sd); - evas_object_event_callback_del_full - (sd->event_rect, EVAS_CALLBACK_MOUSE_MOVE, - _efl_ui_scroll_manager_mouse_move_event_cb, sd); -} - static void _efl_ui_scroll_manager_pan_content_changed_cb(void *data, const Efl_Event *event EINA_UNUSED) { @@ -2463,8 +2444,6 @@ _efl_ui_scroll_manager_efl_object_destructor(Eo *obj, Efl_Ui_Scroll_Manager_Data efl_event_callback_del (sd->pan_obj, EFL_UI_PAN_EVENT_POSITION_CHANGED, _efl_ui_scroll_manager_pan_position_changed_cb, sd); - _scroll_event_object_detach(obj); - efl_destructor(efl_super(obj, MY_CLASS)); }