xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-window.c |    4 ++--
 hw/xwayland/xwayland.c        |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 95539ab37baa1292d1f2daaa552f9741b0364cad
Author: Mariusz Ceier <mceier+freedesktop at gmail.com>
Date:   Wed Dec 2 12:29:15 2020 +0100

    xwayland: Replace LogMessage with LogMessageVerb
    
    LogMessage logs only when the XLOG_VERBOSITY is >= 1, but by default
    XLOG_VERBOSITY is 0, so for example warning about deprected -listen
    parameter is never shown when running "Xwayland -listen 32 -help".
    
    Signed-off-by: Mariusz Ceier <mceier+freedesktop at gmail.com>

diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index 486149c4a..00a81848a 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -73,8 +73,8 @@ xwl_window_set_allow_commits_from_property(struct xwl_window *xwl_window,
         xwl_window_set_allow_commits(xwl_window, TRUE, "WM fault");
 
         if (!warned) {
-            LogMessage(X_WARNING, "Window manager is misusing property %s.\n",
-                       NameForAtom(prop->propertyName));
+            LogMessageVerb(X_WARNING, 0, "Window manager is misusing property %s.\n",
+                           NameForAtom(prop->propertyName));
             warned = TRUE;
         }
         return;
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index ee7dc312c..9fc3db976 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -136,8 +136,8 @@ ddxProcessArgument(int argc, char *argv[], int i)
         if (!isdigit(*argv[i + 1]))
             return 0;
 
-        LogMessage(X_WARNING, "Option \"-listen\" for file descriptors is deprecated\n"
-                              "Please use \"-listenfd\" instead.\n");
+        LogMessageVerb(X_WARNING, 0, "Option \"-listen\" for file descriptors is deprecated\n"
+                                     "Please use \"-listenfd\" instead.\n");
 
         xwl_add_listen_fd (argc, argv, i);
         return 2;