isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-26 03:18:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Drop HAVE_XSETIOERROREXITHANDLER checks

Browse Source 
This define was dropped by commit 0e8aaebc00f (xwayland: Make
XSetIOErrorExitHandler() mandatory), but some #ifdef checks were
brought back by commit 36f30341acb (wayland: Add a prepare-shutdown
signal).

Since there's no define anymore in config.h, these pieces of code
were unintentionally disabled, and a meta_get_display() call be
also left over. Remove the ifdefs and update the code to build
again.

Fixes: 36f30341acb - wayland: Add a prepare-shutdown signal
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2786>
This commit is contained in:
Carlos Garnacho 2023-01-12 14:18:31 +01:00 committed by Marge Bot
parent 78a3631d15
commit 95c2154039
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -515,13 +515,11 @@ x_io_error_exit (Display *display,
} }
} }
#ifdef HAVE_XSETIOERROREXITHANDLER
static void static void
x_io_error_exit_noop (Display *display, x_io_error_exit_noop (Display *display,
void *data) void *data)
{ {
} }
#endif
void void
meta_xwayland_override_display_number (int number) meta_xwayland_override_display_number (int number)
@ -1013,23 +1011,20 @@ static void
meta_xwayland_shutdown (MetaWaylandCompositor *compositor) meta_xwayland_shutdown (MetaWaylandCompositor *compositor)
{ {
MetaXWaylandManager *manager = &compositor->xwayland_manager; MetaXWaylandManager *manager = &compositor->xwayland_manager;
#ifdef HAVE_XSETIOERROREXITHANDLER MetaContext *context = meta_wayland_compositor_get_context (compositor);
MetaDisplay *display = meta_get_display (); MetaDisplay *display = meta_context_get_display (context);
MetaX11Display *x11_display; MetaX11Display *x11_display;
#endif
char path[256]; char path[256];
g_cancellable_cancel (manager->xserver_died_cancellable); g_cancellable_cancel (manager->xserver_died_cancellable);
XSetIOErrorHandler (x_io_error_noop); XSetIOErrorHandler (x_io_error_noop);
#ifdef HAVE_XSETIOERROREXITHANDLER
x11_display = display->x11_display; x11_display = display->x11_display;
if (x11_display) if (x11_display)
{ {
XSetIOErrorExitHandler (meta_x11_display_get_xdisplay (x11_display), XSetIOErrorExitHandler (meta_x11_display_get_xdisplay (x11_display),
x_io_error_exit_noop, NULL); x_io_error_exit_noop, NULL);
} }
#endif
meta_xwayland_terminate (manager); meta_xwayland_terminate (manager);