[mutter/bilelmoussaoui/x11-build-guards-2] wayland: Drop meta_wayland_compositor_init_display
- From: Bilal Elmoussaoui <bilelmoussaoui src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/bilelmoussaoui/x11-build-guards-2] wayland: Drop meta_wayland_compositor_init_display
- Date: Thu, 22 Sep 2022 15:46:40 +0000 (UTC)
commit ef450ecd5c7bc9f3f61e44b4db8419d91601f907
Author: Bilal Elmoussaoui <belmouss redhat com>
Date: Thu Sep 22 17:45:31 2022 +0200
wayland: Drop meta_wayland_compositor_init_display
It only called a xwayland specicfic function
src/core/display.c | 3 ++-
src/wayland/meta-wayland.c | 9 ---------
src/wayland/meta-wayland.h | 3 ---
3 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index 7c5f86d10e..2a6a8326be 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -935,7 +935,8 @@ meta_display_new (MetaContext *context,
MetaWaylandCompositor *wayland_compositor =
meta_wayland_compositor_get_default ();
- meta_wayland_compositor_init_display (wayland_compositor, display);
+ meta_xwayland_init_display (&wayland_compositor->xwayland_manager,
+ display);
MetaX11DisplayPolicy x11_display_policy;
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 5905be84b5..d9d603a7f7 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -409,15 +409,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 901faaed12..b448fe698e 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);
-
META_EXPORT_TEST
MetaWaylandCompositor *meta_wayland_compositor_get_default (void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]