[vlc-devel] commit: Fixed globalhotkeys compilation with old xcb version. ( cherry picked from commit d210da89ff1fdd4a658142f960b39efd6715de2d) ( Laurent Aimar )

git version control git at videolan.org
Mon Nov 16 21:48:01 CET 2009


vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Wed Oct  7 21:32:27 2009 +0200| [335ec24801c31a672653b2155f916788d1c28320] | committer: Rafaël Carré 

Fixed globalhotkeys compilation with old xcb version. (cherry picked from commit d210da89ff1fdd4a658142f960b39efd6715de2d)

Signed-off-by: Rafaël Carré <rafael.carre at gmail.com>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=335ec24801c31a672653b2155f916788d1c28320
---

 modules/control/globalhotkeys/xcb.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/modules/control/globalhotkeys/xcb.c b/modules/control/globalhotkeys/xcb.c
index c4da023..d654c64 100644
--- a/modules/control/globalhotkeys/xcb.c
+++ b/modules/control/globalhotkeys/xcb.c
@@ -185,6 +185,7 @@ static unsigned GetModifier( xcb_connection_t *p_connection, xcb_key_symbols_t *
 #ifdef XCB_KEYSYM_OLD_API /* as seen in Debian Lenny */
     const xcb_keycode_t key = xcb_key_symbols_get_keycode( p_symbols, sym );
     if( key == 0 )
+        return 0;
 #else
     const xcb_keycode_t *p_keys = xcb_key_symbols_get_keycode( p_symbols, sym );
     if( !p_keys )




More information about the vlc-devel mailing list