summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-09-26 09:56:06 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-09-26 10:15:07 -0700
commit0b8e3e6fcf232563a11d2c128200eaf01a2b5689 (patch)
tree8603c0f9ca0a970b92bc5bedf59469f01f4f2030 /src/lib/elementary
parent0ad6c47ec2838d50d17fcb7b026a061043afc3ab (diff)
elementary: restore input propagation and destroy array properly.
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_win.c8
1 files changed, 4 insertions, 4 deletions
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)
2203} 2203}
2204 2204
2205EFL_CALLBACKS_ARRAY_DEFINE(_elm_win_tracking, 2205EFL_CALLBACKS_ARRAY_DEFINE(_elm_win_tracking,
2206 { EFL_EVENT_CALLBACK_ADD, _win_event_add_cb },
2207 { EFL_EVENT_CALLBACK_DEL, _win_event_del_cb },
2206 { EFL_UI_WIN_EVENT_PAUSE, _win_paused }) 2208 { EFL_UI_WIN_EVENT_PAUSE, _win_paused })
2207 2209
2208static void 2210static void
@@ -2827,11 +2829,9 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
2827 _elm_win_on_resize_obj_changed_size_hints, 2829 _elm_win_on_resize_obj_changed_size_hints,
2828 obj); 2830 obj);
2829 2831
2830 efl_event_callback_del(obj, EFL_EVENT_CALLBACK_ADD, _win_event_add_cb, sd); 2832 efl_event_callback_array_del(obj, _elm_evas_tracking(), sd);
2831 efl_event_callback_del(obj, EFL_EVENT_CALLBACK_DEL, _win_event_del_cb, sd);
2832 efl_event_callback_array_del(obj, _elm_win_evas_feed_fake_callbacks(), sd->evas); 2833 efl_event_callback_array_del(obj, _elm_win_evas_feed_fake_callbacks(), sd->evas);
2833 2834 efl_event_callback_array_del(sd->evas, _elm_win_tracking(), sd);
2834 efl_event_callback_del(sd->evas, EFL_EVENT_POINTER_UP, _elm_win_cb_mouse_up, sd);
2835 evas_object_del(sd->legacy.box); 2835 evas_object_del(sd->legacy.box);
2836 evas_object_del(sd->legacy.edje); 2836 evas_object_del(sd->legacy.edje);
2837 2837