From 6c82037ac0ed557bf005235af507529c07fd7031 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 10 Jul 2019 14:06:47 -0400 Subject: [PATCH] efl/selection_manager: remove correct conditional ref ac26c0a69d0b4fc4b8e3517e23fe6b5c3b77a555 Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D9265 --- src/lib/elementary/efl_ui_selection_manager.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/elementary/efl_ui_selection_manager.c b/src/lib/elementary/efl_ui_selection_manager.c index 9ccfe40eb4..0963abc027 100644 --- a/src/lib/elementary/efl_ui_selection_manager.c +++ b/src/lib/elementary/efl_ui_selection_manager.c @@ -5475,12 +5475,15 @@ _efl_ui_selection_manager_efl_object_constructor(Eo *obj, Efl_Ui_Selection_Manag pd->text_uri = eina_stringshare_add("text/uri-list"); #ifdef HAVE_ELEMENTARY_WL2 - pd->send_handler = ecore_event_handler_add(ECORE_WL2_EVENT_DATA_SOURCE_SEND, - _wl_selection_send, pd); - pd->changed_handler = ecore_event_handler_add(ECORE_WL2_EVENT_SEAT_SELECTION, - _wl_selection_changed, pd); - pd->end_handler = ecore_event_handler_add(ECORE_WL2_EVENT_DATA_SOURCE_END, - _wl_dnd_end, pd); + if (_elm_wl_display) + { + pd->send_handler = ecore_event_handler_add(ECORE_WL2_EVENT_DATA_SOURCE_SEND, + _wl_selection_send, pd); + pd->changed_handler = ecore_event_handler_add(ECORE_WL2_EVENT_SEAT_SELECTION, + _wl_selection_changed, pd); + pd->end_handler = ecore_event_handler_add(ECORE_WL2_EVENT_DATA_SOURCE_END, + _wl_dnd_end, pd); + } #endif managers = eina_list_append(managers, obj); return obj; @@ -5503,12 +5506,9 @@ _efl_ui_selection_manager_efl_object_destructor(Eo *obj, Efl_Ui_Selection_Manage ecore_event_handler_del(pd->clear_handler); #endif #ifdef HAVE_ELEMENTARY_WL2 - if (_elm_wl_display) - { - ecore_event_handler_del(pd->send_handler); - ecore_event_handler_del(pd->changed_handler); - ecore_event_handler_del(pd->end_handler); - } + ecore_event_handler_del(pd->send_handler); + ecore_event_handler_del(pd->changed_handler); + ecore_event_handler_del(pd->end_handler); #endif free(pd->atom_list); EINA_LIST_FREE(pd->seat_list, seat_sel)