From 0b8e3e6fcf232563a11d2c128200eaf01a2b5689 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Tue, 26 Sep 2017 09:56:06 -0700 Subject: elementary: restore input propagation and destroy array properly. --- src/lib/elementary/efl_ui_win.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib/elementary') diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index ecc07a6a9b..b70efcc118 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -2203,6 +2203,8 @@ _win_paused(void *data, const Efl_Event *ev) } EFL_CALLBACKS_ARRAY_DEFINE(_elm_win_tracking, + { EFL_EVENT_CALLBACK_ADD, _win_event_add_cb }, + { EFL_EVENT_CALLBACK_DEL, _win_event_del_cb }, { EFL_UI_WIN_EVENT_PAUSE, _win_paused }) static void @@ -2827,11 +2829,9 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd) _elm_win_on_resize_obj_changed_size_hints, obj); - efl_event_callback_del(obj, EFL_EVENT_CALLBACK_ADD, _win_event_add_cb, sd); - efl_event_callback_del(obj, EFL_EVENT_CALLBACK_DEL, _win_event_del_cb, sd); + efl_event_callback_array_del(obj, _elm_evas_tracking(), sd); efl_event_callback_array_del(obj, _elm_win_evas_feed_fake_callbacks(), sd->evas); - - efl_event_callback_del(sd->evas, EFL_EVENT_POINTER_UP, _elm_win_cb_mouse_up, sd); + efl_event_callback_array_del(sd->evas, _elm_win_tracking(), sd); evas_object_del(sd->legacy.box); evas_object_del(sd->legacy.edje); -- cgit v1.2.1