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

remove xdg-shell v5 support 

this cannot coexist with xdg-shell final due to symbol collisions
This commit is contained in:
Mike Blumenkrantz 2018-01-08 12:10:22 -05:00
parent 7a3b3d23f6
commit 3dae27bfba
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/wl_desktop_shell/e_mod_main.c
View File

@ -167,7 +167,7 @@ e_modapi_init(E_Module *m)
return NULL; return NULL;
} }
have_shell = e_xdg_shell_v5_init() | e_xdg_shell_v6_init() | e_xdg_shell_init(); have_shell = e_xdg_shell_v6_init() | e_xdg_shell_init();
if (!have_shell) return NULL; if (!have_shell) return NULL;
#ifdef HAVE_WL_TEXT_INPUT #ifdef HAVE_WL_TEXT_INPUT

1
src/modules/wl_desktop_shell/e_mod_main.h
View File

@ -15,7 +15,6 @@ EINTERN void e_shell_surface_parent_set(E_Client *ec, struct wl_resource *parent
EINTERN void e_shell_surface_mouse_down_helper(E_Client *ec, E_Binding_Event_Mouse_Button *ev, Eina_Bool move); EINTERN void e_shell_surface_mouse_down_helper(E_Client *ec, E_Binding_Event_Mouse_Button *ev, Eina_Bool move);
EINTERN E_Shell_Data *e_shell_data_new(unsigned int version); EINTERN E_Shell_Data *e_shell_data_new(unsigned int version);
EINTERN Eina_Bool e_xdg_shell_v5_init(void);
EINTERN Eina_Bool e_xdg_shell_v6_init(void); EINTERN Eina_Bool e_xdg_shell_v6_init(void);
EINTERN Eina_Bool e_xdg_shell_init(void); EINTERN Eina_Bool e_xdg_shell_init(void);
EINTERN void wl_shell_cb_bind(struct wl_client *client, void *data EINA_UNUSED, uint32_t version, uint32_t id); EINTERN void wl_shell_cb_bind(struct wl_client *client, void *data EINA_UNUSED, uint32_t version, uint32_t id);

2
src/modules/wl_desktop_shell/meson.build
View File

@ -5,14 +5,12 @@ else
'e_mod_main.c', 'e_mod_main.c',
'e_mod_input_panel.c', 'e_mod_input_panel.c',
'wl_shell.c', 'wl_shell.c',
'xdg5.c',
'xdg6.c', 'xdg6.c',
'xdg.c', 'xdg.c',
'e_mod_main.h' 'e_mod_main.h'
) )
foreach p: [ foreach p: [
'@0@/unstable/xdg-shell/xdg-shell-unstable-v5.xml'.format(dir_wayland_protocols),
'@0@/unstable/xdg-shell/xdg-shell-unstable-v6.xml'.format(dir_wayland_protocols), '@0@/unstable/xdg-shell/xdg-shell-unstable-v6.xml'.format(dir_wayland_protocols),
'@0@/stable/xdg-shell/xdg-shell.xml'.format(dir_wayland_protocols), '@0@/stable/xdg-shell/xdg-shell.xml'.format(dir_wayland_protocols),
'@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols), '@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols),