summaryrefslogtreecommitdiff
path: root/src/wayland/meta-wayland.c
diff options
context:
space:
mode:
authorJonas Ã…dahl <jadahl@gmail.com>2021-05-06 18:49:25 +0200
committerMarge Bot <marge-bot@gnome.org>2021-05-18 14:03:22 +0000
commitdc97163bcd6246cbe6c12b9c7257cef571553f02 (patch)
treefbdfc77359386933d0a8d6b783fa70d5cecd7485 /src/wayland/meta-wayland.c
parentd03c194552177e050169065419c77a779af4c504 (diff)
downloadmutter-dc97163bcd6246cbe6c12b9c7257cef571553f02.tar.gz
xwayland: Pass MetaWaylandCompositor pointer when initializing
This way we can initialize without having any way to retrieve it via some global variable. This isn't needed now, but will be once Wayland infrastructure initializiation is done in a single step. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1863>
Diffstat (limited to 'src/wayland/meta-wayland.c')
-rw-r--r--src/wayland/meta-wayland.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 842136ef4..4145e65c8 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -558,6 +558,7 @@ meta_wayland_compositor_setup (MetaWaylandCompositor *compositor)
g_autoptr (GError) error = NULL;
if (!meta_xwayland_init (&compositor->xwayland_manager,
+ compositor,
compositor->wayland_display,
&error))
g_error ("Failed to start X Wayland: %s", error->message);