[Xfce4-commits] [xfce/xfwm4] 02/02: compositor: Fix typo in vblank options

[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       m   a   s   t   e   r   
   in repository xfce/xfwm4.

commit 85c8a57a1fcdc3510e38c93071319ebe3cfcdbeb
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Mon Jul 30 21:00:59 2018 +0200

    compositor: Fix typo in vblank options
    
    Bug: 14564
    
    the right options is "--vblank=xpresent", not "--vblank=present".
    
    Also, show relevant option only if backend is actually available at
    build time.
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 src/main.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main.c b/src/main.c
index 8a98f9c..4f2b897 100644
--- a/src/main.c
+++ b/src/main.c
@@ -691,8 +691,15 @@ main (int argc, char **argv)
         { "daemon", '\0', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, daemon_callback, N_("Fork to the background (not supported)"), NULL },
 #ifdef HAVE_COMPOSITOR
         { "compositor", '\0', 0, G_OPTION_ARG_CALLBACK, compositor_callback, N_("Set the compositor mode"), "on|off|auto" },
-        { "vblank", '\0', 0, G_OPTION_ARG_CALLBACK, vblank_callback, N_("Set the vblank mode"), "off|present|glx" },
-#endif
+        { "vblank", '\0', 0, G_OPTION_ARG_CALLBACK, vblank_callback, N_("Set the vblank mode"), "off"
+#ifdef HAVE_PRESENT_EXTENSION
+          "|xpresent"
+#endif /* HAVE_PRESENT_EXTENSION */
+#ifdef HAVE_EPOXY
+          "|glx"
+#endif /* HAVE_EPOXY */
+        },
+#endif /* HAVE_COMPOSITOR */
         { "replace", '\0', 0, G_OPTION_ARG_NONE, &replace_wm, N_("Replace the existing window manager"), NULL },
         { "version", 'V', 0, G_OPTION_ARG_NONE, &version, N_("Print version information and exit"), NULL },
         { NULL }

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