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