XCB/X11: support different color depth than parent window (refs #3581)

[vlc] / src / libvlc-module.c

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index d4077fe6b3e65609b997f51cb8b2d8f036da40ea..43e9bef772161f49589b6df25f662e5d17624df7 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -2052,6 +2052,10 @@ vlc_module_begin ()
                    DATA_PATH_LONGTEXT, true )
         change_need_restart ()
 
+    add_string( "user-agent", "(LibVLC "VERSION")", NULL, "", "", true )
+        change_safe ()
+        change_private ()
+
     set_section( N_("Performance options"), NULL )
     add_obsolete_bool( "minimize-threads" )
 
@@ -2432,10 +2436,10 @@ vlc_module_begin ()
 #   define KEY_UNCROP_RIGHT       KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'f'
 
 /* Zooming */
-#   define KEY_ZOOM_QUARTER       KEY_MODIFIER_CTRL|'1'
-#   define KEY_ZOOM_HALF          KEY_MODIFIER_CTRL|'2'
-#   define KEY_ZOOM_ORIGINAL      KEY_MODIFIER_CTRL|'3'
-#   define KEY_ZOOM_DOUBLE        KEY_MODIFIER_CTRL|'4'
+#   define KEY_ZOOM_QUARTER       KEY_MODIFIER_ALT|'1'
+#   define KEY_ZOOM_HALF          KEY_MODIFIER_ALT|'2'
+#   define KEY_ZOOM_ORIGINAL      KEY_MODIFIER_ALT|'3'
+#   define KEY_ZOOM_DOUBLE        KEY_MODIFIER_ALT|'4'
 
 /* Bookmarks */
 #   define KEY_SET_BOOKMARK1      KEY_MODIFIER_CTRL|KEY_F1
@@ -2779,8 +2783,6 @@ vlc_module_begin ()
         change_volatile ()
     add_string( "config", NULL, NULL, CONFIG_TEXT, "", false )
         change_volatile ()
-    add_bool( "version", false, NULL, VERSION_TEXT, "", false )
-        change_volatile ()
 
    /* Usage (mainly useful for cmd line stuff) */
     /* add_usage_hint( PLAYLIST_USAGE ) */