[Xfce4-commits] [xfce/xfwm4] 02/02: compositor: Use a message instead of warning

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   l   i   v   i   e   r       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       x   f   c   e   -   4   .   1   4   
   in repository xfce/xfwm4.

commit 5a5d494941990053f05cf54d6118bc658b193dc1
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Sun Apr 12 10:20:26 2020 +0200

    compositor: Use a message instead of warning
    
    When using automatic vblank mode, use a message instead of a warning.
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
    (cherry picked from commit 5f29827fd47e677bbefaae0cce67edfa00cd7e7f)
---
 src/compositor.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/compositor.c b/src/compositor.c
index 5cafb7d..b85c7b9 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1071,7 +1071,6 @@ check_glx_renderer (ScreenInfo *screen_info)
         NULL
     };
 #endif /* HAVE_PRESENT_EXTENSION */
-
     int i;
 
     g_return_val_if_fail (screen_info != NULL, FALSE);
@@ -1085,15 +1084,6 @@ check_glx_renderer (ScreenInfo *screen_info)
     }
     DBG ("Using GL renderer: %s", glRenderer);
 
-    i = 0;
-    while (blacklisted[i] && !strcasestr (glRenderer, blacklisted[i]))
-        i++;
-    if (blacklisted[i])
-    {
-        g_warning ("Unsupported GL renderer (%s).", glRenderer);
-        return FALSE;
-    }
-
 #if HAVE_PRESENT_EXTENSION
     if (screen_info->vblank_mode == VBLANK_AUTO)
     {
@@ -1102,12 +1092,21 @@ check_glx_renderer (ScreenInfo *screen_info)
             i++;
         if (prefer_xpresent[i])
         {
-            g_warning ("Prefer XPresent with %s", glRenderer);
+            g_message ("Prefer XPresent with %s", glRenderer);
             return FALSE;
         }
     }
 #endif /* HAVE_PRESENT_EXTENSION */
 
+    i = 0;
+    while (blacklisted[i] && !strcasestr (glRenderer, blacklisted[i]))
+        i++;
+    if (blacklisted[i])
+    {
+        g_warning ("Unsupported GL renderer (%s).", glRenderer);
+        return FALSE;
+    }
+
     return TRUE;
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.