Skip to content
Snippets Groups Projects
Commit df8d0631 authored by Jonas Ådahl's avatar Jonas Ådahl
Browse files

xwayland: Only warn on X IO errors when X11 is mandatory

This avoids warnings when we're just slightly unlucky when Xwayland went
away due to inactivity.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2364>
parent 20c4843f
No related branches found
No related tags found
No related merge requests found
...@@ -54,6 +54,8 @@ typedef struct ...@@ -54,6 +54,8 @@ typedef struct
struct _MetaXWaylandManager struct _MetaXWaylandManager
{ {
MetaWaylandCompositor *compositor;
MetaXWaylandConnection private_connection; MetaXWaylandConnection private_connection;
MetaXWaylandConnection public_connection; MetaXWaylandConnection public_connection;
......
...@@ -478,7 +478,16 @@ static void ...@@ -478,7 +478,16 @@ static void
x_io_error_exit (Display *display, x_io_error_exit (Display *display,
void *data) void *data)
{ {
g_warning ("Xwayland just died, attempting to recover"); MetaXWaylandManager *manager = data;
MetaX11DisplayPolicy x11_display_policy;
x11_display_policy =
meta_context_get_x11_display_policy (manager->compositor->context);
if (x11_display_policy == META_X11_DISPLAY_POLICY_MANDATORY)
g_warning ("X Wayland crashed (X IO error)");
else
meta_topic (META_DEBUG_WAYLAND, "Xwayland disappeared");
} }
static void static void
...@@ -1033,6 +1042,7 @@ meta_xwayland_init (MetaXWaylandManager *manager, ...@@ -1033,6 +1042,7 @@ meta_xwayland_init (MetaXWaylandManager *manager,
manager->public_connection.name, manager->public_connection.name,
manager->private_connection.name); manager->private_connection.name);
manager->compositor = compositor;
manager->wayland_display = wl_display; manager->wayland_display = wl_display;
policy = meta_context_get_x11_display_policy (context); policy = meta_context_get_x11_display_policy (context);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment