summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2018-11-15 10:52:16 +0200
committerDaniel Hirt <hirt.danny@gmail.com>2018-11-26 13:17:07 +0200
commita7b1329b0efb6997808708fb9a3cdbe4a867ba39 (patch)
tree41d8c2bb95774bff06616bbcba0c57eacf6b1579 /src/lib/elementary
parentc87d23f9428997ae0364d29af2514fbe44fecadf (diff)
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.
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.c21
1 files changed, 0 insertions, 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
@@ -1948,25 +1948,6 @@ _scroll_event_object_attach(Evas_Object *obj)
1948} 1948}
1949 1949
1950static void 1950static void
1951_scroll_event_object_detach(Evas_Object *obj)
1952{
1953 EFL_UI_SCROLL_MANAGER_DATA_GET_OR_RETURN(obj, sd);
1954
1955 evas_object_event_callback_del_full
1956 (sd->event_rect, EVAS_CALLBACK_MOUSE_WHEEL, _efl_ui_scroll_manager_wheel_event_cb,
1957 sd);
1958 evas_object_event_callback_del_full
1959 (sd->event_rect, EVAS_CALLBACK_MOUSE_DOWN,
1960 _efl_ui_scroll_manager_mouse_down_event_cb, sd);
1961 evas_object_event_callback_del_full
1962 (sd->event_rect, EVAS_CALLBACK_MOUSE_UP,
1963 _efl_ui_scroll_manager_mouse_up_event_cb, sd);
1964 evas_object_event_callback_del_full
1965 (sd->event_rect, EVAS_CALLBACK_MOUSE_MOVE,
1966 _efl_ui_scroll_manager_mouse_move_event_cb, sd);
1967}
1968
1969static void
1970_efl_ui_scroll_manager_pan_content_changed_cb(void *data, const Efl_Event *event EINA_UNUSED) 1951_efl_ui_scroll_manager_pan_content_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
1971{ 1952{
1972 Efl_Ui_Scroll_Manager_Data *sd = data; 1953 Efl_Ui_Scroll_Manager_Data *sd = data;
@@ -2463,8 +2444,6 @@ _efl_ui_scroll_manager_efl_object_destructor(Eo *obj, Efl_Ui_Scroll_Manager_Data
2463 efl_event_callback_del 2444 efl_event_callback_del
2464 (sd->pan_obj, EFL_UI_PAN_EVENT_POSITION_CHANGED, _efl_ui_scroll_manager_pan_position_changed_cb, sd); 2445 (sd->pan_obj, EFL_UI_PAN_EVENT_POSITION_CHANGED, _efl_ui_scroll_manager_pan_position_changed_cb, sd);
2465 2446
2466 _scroll_event_object_detach(obj);
2467
2468 efl_destructor(efl_super(obj, MY_CLASS)); 2447 efl_destructor(efl_super(obj, MY_CLASS));
2469} 2448}
2470 2449