From b9a6891910c2c07226d66738aca488160585e726 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Mon, 15 May 2023 20:33:11 +0200
Subject: display: Drop the indirection when initializating Xwayland

The init function didn't do much other then calling into the xwayland
one

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2445>
---
 src/core/display.c         | 6 +++---
 src/wayland/meta-wayland.c | 9 ---------
 src/wayland/meta-wayland.h | 3 ---
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/core/display.c b/src/core/display.c
index 4b7467bed..e74cacef0 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -937,11 +937,11 @@ meta_display_new (MetaContext  *context,
 #ifdef HAVE_XWAYLAND
       MetaWaylandCompositor *wayland_compositor =
         wayland_compositor_from_display (display);
-
-      meta_wayland_compositor_init_display (wayland_compositor, display);
-
       MetaX11DisplayPolicy x11_display_policy;
 
+      meta_xwayland_init_display (&wayland_compositor->xwayland_manager,
+                                  display);
+
       x11_display_policy = meta_context_get_x11_display_policy (context);
       if (x11_display_policy == META_X11_DISPLAY_POLICY_MANDATORY)
         {
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index c83504137..c27bb5449 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -588,15 +588,6 @@ set_gnome_env (const char *name,
     }
 }
 
-void
-meta_wayland_compositor_init_display (MetaWaylandCompositor *compositor,
-                                      MetaDisplay           *display)
-{
-#ifdef HAVE_XWAYLAND
-  meta_xwayland_init_display (&compositor->xwayland_manager, display);
-#endif
-}
-
 static void meta_wayland_log_func (const char *, va_list) G_GNUC_PRINTF (1, 0);
 
 static void
diff --git a/src/wayland/meta-wayland.h b/src/wayland/meta-wayland.h
index f842d6f18..78487bb4c 100644
--- a/src/wayland/meta-wayland.h
+++ b/src/wayland/meta-wayland.h
@@ -36,9 +36,6 @@ MetaWaylandCompositor * meta_wayland_compositor_new             (MetaContext *co
 
 void                    meta_wayland_compositor_prepare_shutdown (MetaWaylandCompositor *compositor);
 
-void                    meta_wayland_compositor_init_display    (MetaWaylandCompositor *compositor,
-                                                                 MetaDisplay           *display);
-
 void                    meta_wayland_compositor_update          (MetaWaylandCompositor *compositor,
                                                                  const ClutterEvent    *event);
 
-- 
cgit v1.2.1