brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display: Drop the indirection when initializating Xwayland

Browse Source 
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>
This commit is contained in:
Bilal Elmoussaoui 2023-05-15 20:33:11 +02:00
parent 15b25568b2
commit b9a6891910
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/display.c
View File

@ -937,11 +937,11 @@ meta_display_new (MetaContext *context,
#ifdef HAVE_XWAYLAND #ifdef HAVE_XWAYLAND
MetaWaylandCompositor *wayland_compositor = MetaWaylandCompositor *wayland_compositor =
wayland_compositor_from_display (display); wayland_compositor_from_display (display);
meta_wayland_compositor_init_display (wayland_compositor, display);
MetaX11DisplayPolicy x11_display_policy; MetaX11DisplayPolicy x11_display_policy;
meta_xwayland_init_display (&wayland_compositor->xwayland_manager,
display);
x11_display_policy = meta_context_get_x11_display_policy (context); x11_display_policy = meta_context_get_x11_display_policy (context);
if (x11_display_policy == META_X11_DISPLAY_POLICY_MANDATORY) if (x11_display_policy == META_X11_DISPLAY_POLICY_MANDATORY)
{ {

9
src/wayland/meta-wayland.c
View File

@ -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 meta_wayland_log_func (const char *, va_list) G_GNUC_PRINTF (1, 0);
static void static void

3
src/wayland/meta-wayland.h
View File

@ -36,9 +36,6 @@ MetaWaylandCompositor * meta_wayland_compositor_new (MetaContext *co
void meta_wayland_compositor_prepare_shutdown (MetaWaylandCompositor *compositor); 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, void meta_wayland_compositor_update (MetaWaylandCompositor *compositor,
const ClutterEvent *event); const ClutterEvent *event);