Only load globalhotkeys if requested by caller

[vlc] / src / libvlc.c

diff --git a/src/libvlc.c b/src/libvlc.c
index f6d6be839f313499ff001b9a2ad2b00482855994..d1aa5f864d29a5a6afbe757825e0e0811045d79a 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -67,7 +67,6 @@
 #endif
 
 #ifdef ENABLE_NLS
-# undef gettext
 # include <libintl.h> /* bindtextdomain */
 #endif
 
@@ -341,7 +340,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     /* Announce who we are - Do it only for first instance ? */
     msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE );
     msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
-    /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
+    /*xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
     msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
 
     /* Check for short help option */
@@ -905,8 +904,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
      * Always load the hotkeys interface if it exists
      */
     libvlc_InternalAddIntf( p_libvlc, "hotkeys,none" );
-    if( module_exists( "globalhotkeys" ) )
-        libvlc_InternalAddIntf( p_libvlc, "globalhotkeys,none" );
 
 #ifdef HAVE_DBUS
     /* loads dbus control interface if in one-instance mode
@@ -987,7 +984,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     /*
      * FIXME: kludge to use a p_libvlc-local variable for the Mozilla plugin
      */
-    var_Create( p_libvlc, "drawable-xid", VLC_VAR_INTEGER );
+    var_Create( p_libvlc, "drawable-xid", VLC_VAR_DOINHERIT|VLC_VAR_INTEGER );
     var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_ADDRESS );
     var_Create( p_libvlc, "drawable-agl", VLC_VAR_INTEGER );
     var_Create( p_libvlc, "drawable-gl", VLC_VAR_INTEGER );