sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

xwayland: Don't spew warnings when looking for X11 displays

Browse source 
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>
This commit is contained in:
Jonas Ådahl 2020-12-08 17:45:05 +01:00 • committed by Marge Bot
parent 4ef34ed68f
commit d940911478
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/wayland/meta-xwayland.c
View file

@ -239,7 +239,8 @@ create_lock_file (int display,
while (!try_display (display, &filename, &fd, &local_error)) 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); g_clear_error (&local_error);
display++; display++;
number_of_tries++; number_of_tries++;
@ -832,6 +833,10 @@ meta_xwayland_init (MetaXWaylandManager *manager,
return FALSE; 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; manager->wayland_display = wl_display;
policy = meta_get_x11_display_policy (); policy = meta_get_x11_display_policy ();