[mutter/bilelmoussaoui/without-xwayland: 4/5] wayland: Move Xwayland specific call to xwayland

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit fb9a7576ffc474ae9f628e646306638268e33b0e
Author: Bilal Elmoussaoui <belmouss redhat com>
Date:   Wed Jun 15 13:24:45 2022 +0200

    wayland: Move Xwayland specific call to xwayland

 src/wayland/meta-wayland.c  | 8 --------
 src/wayland/meta-xwayland.c | 5 +++++
 2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 74f8a98f7a..f354f3de2a 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -621,14 +621,6 @@ meta_wayland_compositor_new (MetaContext *context)
   meta_wayland_init_presentation_time (compositor);
   meta_wayland_activation_init (compositor);
 
-#ifdef HAVE_XWAYLAND
-  /* Xwayland specific protocol, needs to be filtered out for all other clients */
-  if (meta_xwayland_grab_keyboard_init (compositor))
-    wl_display_set_global_filter (compositor->wayland_display,
-                                  meta_xwayland_global_filter,
-                                  compositor);
-#endif
-
 #ifdef HAVE_WAYLAND_EGLSTREAM
   {
     gboolean should_enable_eglstream_controller = TRUE;
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index d43a562e8e..aefbf29f3e 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -1117,6 +1117,11 @@ meta_xwayland_init (MetaXWaylandManager    *manager,
     g_signal_connect (compositor, "prepare-shutdown", 
                       G_CALLBACK (meta_xwayland_shutdown), NULL);
 
+  /* Xwayland specific protocol, needs to be filtered out for all other clients */
+  meta_xwayland_grab_keyboard_init (compositor);
+  wl_display_set_global_filter (compositor->wayland_display,
+                                meta_xwayland_global_filter,
+                                compositor);
   return TRUE;
 }