[EGIT] [core/enlightenment] master 02/03: remove xdg-shell v5 support

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=3dae27bfbafbfd6a3de0a1c783e392bfc8adbd91

commit 3dae27bfbafbfd6a3de0a1c783e392bfc8adbd91
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Jan 8 12:10:22 2018 -0500

    remove xdg-shell v5 support
    
    this cannot coexist with xdg-shell final due to symbol collisions
---
 src/modules/wl_desktop_shell/e_mod_main.c | 2 +-
 src/modules/wl_desktop_shell/e_mod_main.h | 1 -
 src/modules/wl_desktop_shell/meson.build  | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/modules/wl_desktop_shell/e_mod_main.c 
b/src/modules/wl_desktop_shell/e_mod_main.c
index 5a53317db..9e760ab5d 100644
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -167,7 +167,7 @@ e_modapi_init(E_Module *m)
         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;
 
 #ifdef HAVE_WL_TEXT_INPUT
diff --git a/src/modules/wl_desktop_shell/e_mod_main.h 
b/src/modules/wl_desktop_shell/e_mod_main.h
index 95c467116..210af0122 100644
--- a/src/modules/wl_desktop_shell/e_mod_main.h
+++ b/src/modules/wl_desktop_shell/e_mod_main.h
@@ -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 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_init(void);
 EINTERN void wl_shell_cb_bind(struct wl_client *client, void *data 
EINA_UNUSED, uint32_t version, uint32_t id);
diff --git a/src/modules/wl_desktop_shell/meson.build 
b/src/modules/wl_desktop_shell/meson.build
index 33b26ab8c..049258e53 100644
--- a/src/modules/wl_desktop_shell/meson.build
+++ b/src/modules/wl_desktop_shell/meson.build
@@ -5,14 +5,12 @@ else
     'e_mod_main.c',
     'e_mod_input_panel.c',
     'wl_shell.c',
-    'xdg5.c',
     'xdg6.c',
     'xdg.c',
     'e_mod_main.h'
    )
 
   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@/stable/xdg-shell/xdg-shell.xml'.format(dir_wayland_protocols),
     
'@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols),

--