* Revert 15357, as it would make vlc crash if you try to load a main interface that...

* Instead, use "screensaver,none" when trying to load the screensaver interface
* Same fix for onther interfaces loaded by libvlc

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 2674c8873e7cd6fb71e4f069443704143be20b9e..4ee2e0834e1aa2b6b4334ae98647d490d9b2dad8 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -115,7 +115,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module,
     }
 
     /* Choose the best module */
-    p_intf->p_module = module_Need( p_intf, "interface", psz_module, VLC_TRUE );
+    p_intf->p_module = module_Need( p_intf, "interface", psz_module, VLC_FALSE );
 
     if( p_intf->p_module == NULL )
     {

diff --git a/src/libvlc.c b/src/libvlc.c
index bef0db4eabba3193b8be8fd6e19266920247b3ad..e3c04a2c5ffd408dd92e68a8ebcb8304849d7973 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -772,30 +772,30 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
 #ifdef HAVE_X11_XLIB_H
     if( config_GetInt( p_vlc, "disable-screensaver" ) == 1 )
     {
-        VLC_AddIntf( 0, "screensaver", VLC_FALSE, VLC_FALSE );
+        VLC_AddIntf( 0, "screensaver,none", VLC_FALSE, VLC_FALSE );
     }
 #endif
 
     if( config_GetInt( p_vlc, "file-logging" ) == 1 )
     {
-        VLC_AddIntf( 0, "logger", VLC_FALSE, VLC_FALSE );
+        VLC_AddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE );
     }
 #ifdef HAVE_SYSLOG_H
     if( config_GetInt( p_vlc, "syslog" ) == 1 )
     {
         char *psz_logmode = "logmode=syslog";
-        AddIntfInternal( 0, "logger", VLC_FALSE, VLC_FALSE, 1, &psz_logmode );
+        AddIntfInternal( 0, "logger,none", VLC_FALSE, VLC_FALSE, 1, &psz_logmode );
     }
 #endif
 
     if( config_GetInt( p_vlc, "show-intf" ) == 1 )
     {
-        VLC_AddIntf( 0, "showintf", VLC_FALSE, VLC_FALSE );
+        VLC_AddIntf( 0, "showintf,none", VLC_FALSE, VLC_FALSE );
     }
 
     if( config_GetInt( p_vlc, "network-synchronisation") == 1 )
     {
-        VLC_AddIntf( 0, "netsync", VLC_FALSE, VLC_FALSE );
+        VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE );
     }
 
     /*