[mutter] xwayland: Don't spew warnings when looking for X11 displays
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] xwayland: Don't spew warnings when looking for X11 displays
- Date: Thu, 10 Dec 2020 15:23:43 +0000 (UTC)
commit d9409114787c57dd3c891fae23720e88313ec252
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Tue Dec 8 17:45:05 2020 +0100
xwayland: Don't spew warnings when looking for X11 displays
It's not important, so only show it when doing MUTTER_DEBUG=wayland.
Instead report what display numbers were eventually found.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1625>
src/wayland/meta-xwayland.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index 783ac18e2d..1480911dc4 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -239,7 +239,8 @@ create_lock_file (int display,
while (!try_display (display, &filename, &fd, &local_error))
{
- g_warning ("Failed to lock X11 display: %s", local_error->message);
+ meta_topic (META_DEBUG_WAYLAND,
+ "Failed to lock X11 display: %s", local_error->message);
g_clear_error (&local_error);
display++;
number_of_tries++;
@@ -832,6 +833,10 @@ meta_xwayland_init (MetaXWaylandManager *manager,
return FALSE;
}
+ g_message ("Using public X11 display %s, (using %s for managed services)",
+ manager->public_connection.name,
+ manager->private_connection.name);
+
manager->wayland_display = wl_display;
policy = meta_get_x11_display_policy ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]