kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efl_selection_manager: shut up shut up shut up ecore-x when running in wayland 

fix T6643
This commit is contained in:
Mike Blumenkrantz 2018-02-13 17:28:40 -05:00
parent f9ef210005
commit 708c4ab576
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib/elementary/efl_selection_manager.c
View File

@ -5261,18 +5261,21 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
int i; int i;
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
for (i = 0; i < SELECTION_N_ATOMS; i++) if (ecore_x_display_get())
{ {
pd->atom_list[i].x_atom = ecore_x_atom_get(pd->atom_list[i].name); for (i = 0; i < SELECTION_N_ATOMS; i++)
ecore_x_selection_converter_atom_add {
(pd->atom_list[i].x_atom, pd->atom_list[i].x_converter); pd->atom_list[i].x_atom = ecore_x_atom_get(pd->atom_list[i].name);
} ecore_x_selection_converter_atom_add
pd->notify_handler = ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY, (pd->atom_list[i].x_atom, pd->atom_list[i].x_converter);
_efl_sel_manager_x11_selection_notify, pd); }
pd->clear_handler = ecore_event_handler_add(ECORE_X_EVENT_SELECTION_CLEAR, pd->notify_handler = ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY,
_x11_selection_clear, pd); _efl_sel_manager_x11_selection_notify, pd);
pd->fix_handler = ecore_event_handler_add(ECORE_X_EVENT_FIXES_SELECTION_NOTIFY, pd->clear_handler = ecore_event_handler_add(ECORE_X_EVENT_SELECTION_CLEAR,
_x11_fixes_selection_notify, pd); _x11_selection_clear, pd);
pd->fix_handler = ecore_event_handler_add(ECORE_X_EVENT_FIXES_SELECTION_NOTIFY,
_x11_fixes_selection_notify, pd);
}
#endif #endif
pd->type_hash = eina_hash_string_small_new(NULL); pd->type_hash = eina_hash_string_small_new(NULL);
@ -5374,7 +5377,8 @@ _efl_selection_manager_efl_object_destructor(Eo *obj, Efl_Selection_Manager_Data
} }
if (init_x) if (init_x)
{ {
ecore_x_shutdown(); if (ecore_x_display_get())
ecore_x_shutdown();
} }
#endif #endif
#ifdef HAVE_ELEMENTARY_WL2 #ifdef HAVE_ELEMENTARY_WL2