1From 48830ce0a5b251ad85df1a080979999816ccf467 Mon Sep 17 00:00:00 2001
2From: Jeffy Chen <jeffy.chen@rock-chips.com>
3Date: Tue, 12 Jul 2022 12:29:11 +0800
4Subject: [PATCH 04/10] xdg-shell: Avoid conflict with xdg-shell-v6
5
6Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
7---
8 src/modules/wl_desktop_shell/xdg.c | 4 ++--
9 1 file changed, 2 insertions(+), 2 deletions(-)
10
11diff --git a/src/modules/wl_desktop_shell/xdg.c b/src/modules/wl_desktop_shell/xdg.c
12index 81e1fb6e6..4892eaa70 100644
13--- a/src/modules/wl_desktop_shell/xdg.c
14+++ b/src/modules/wl_desktop_shell/xdg.c
15@@ -1381,7 +1381,7 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client, struct wl_resource *resour
16                                "Client already has XDG shell surface");
17         return;
18      }
19-   shd = cdata->shell.data = e_shell_data_new(6);
20+   shd = cdata->shell.data = e_shell_data_new(1);
21    shd->width = shd->height = -1;
22
23    /* try to create a shell surface */
24@@ -1445,7 +1445,7 @@ _xdg_client_destroy(E_Client *ec, Eina_Bool do_list)
25    if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
26
27    shd = ec->comp_data->shell.data;
28-   if (shd && (shd->version != 6)) return;
29+   if (shd && (shd->version != 1)) return;
30    if (do_list && shd)
31      {
32         vF_Shell_Data *v;
33--
342.20.1
35
36