summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@free.fr>2019-10-31 09:17:53 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-11-26 11:42:17 -0500
commit8d9c96727556b5853364d7efb805dceda71f7ecf (patch)
treea352bd114d878d0c6b364413b621def0418204fb
parentd50e28aa9fcbf6cdf707ecf8ef2b9986e6fc797b (diff)
elementary: handle case when XFIXES is not available.
Summary: ECORE_X_EVENT_FIXES_SELECTION_NOTIFY is only initialized when XFIXES is available. If ecore_event_handler_add is called with type == 0, it will trigger an abort and elementary would not initialize properly. Depends on D10491 Reviewers: zmike, raster, bu5hm4n, Hermet Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T8321 Differential Revision: https://phab.enlightenment.org/D10492
-rw-r--r--src/lib/elementary/efl_ui_selection_manager.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/elementary/efl_ui_selection_manager.c b/src/lib/elementary/efl_ui_selection_manager.c
index 3c8ab8d9ab..3a5db9713c 100644
--- a/src/lib/elementary/efl_ui_selection_manager.c
+++ b/src/lib/elementary/efl_ui_selection_manager.c
@@ -5475,8 +5475,9 @@ _efl_ui_selection_manager_efl_object_constructor(Eo *obj, Efl_Ui_Selection_Manag
5475 _efl_sel_manager_x11_selection_notify, pd); 5475 _efl_sel_manager_x11_selection_notify, pd);
5476 pd->clear_handler = ecore_event_handler_add(ECORE_X_EVENT_SELECTION_CLEAR, 5476 pd->clear_handler = ecore_event_handler_add(ECORE_X_EVENT_SELECTION_CLEAR,
5477 _x11_selection_clear, pd); 5477 _x11_selection_clear, pd);
5478 pd->fix_handler = ecore_event_handler_add(ECORE_X_EVENT_FIXES_SELECTION_NOTIFY, 5478 if (ECORE_X_EVENT_FIXES_SELECTION_NOTIFY) // If XFIXES is not available ECORE_X_EVENT_FIXES_SELECTION_NOTIFY would be NULL
5479 _x11_fixes_selection_notify, pd); 5479 pd->fix_handler = ecore_event_handler_add(ECORE_X_EVENT_FIXES_SELECTION_NOTIFY,
5480 _x11_fixes_selection_notify, pd);
5480 } 5481 }
5481#endif 5482#endif
5482 5483