From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sun, 17 Jan 2010 20:28:40 +0000 (+0200)
Subject: Remove --save-config
X-Git-Tag: 1.1.0-ff~1137
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=e49c41592564e2ce8da0ac6140003b2154fe6b12

Remove --save-config
---

diff --git a/NEWS b/NEWS
index 30f616f5f8..ee36e06568 100644
--- a/NEWS
+++ b/NEWS
@@ -93,6 +93,7 @@ Maemo port:
 
 Misc:
  * new sqlite module
+ * --save-config command line option not supported anymore.
 
 Removed modules:
  * csri codec. Use libass module instead.
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 97861eadcb..cde971b153 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -2738,8 +2738,6 @@ vlc_module_begin ()
        "matches.")
 #define IGNORE_CONFIG_TEXT \
     N_("no configuration option will be loaded nor saved to config file")
-#define SAVE_CONFIG_TEXT \
-    N_("save the current command line options in the config")
 #define RESET_CONFIG_TEXT \
     N_("reset the current config to the default values")
 #define CONFIG_TEXT \
@@ -2779,10 +2777,7 @@ vlc_module_begin ()
     add_bool( "ignore-config", true, NULL, IGNORE_CONFIG_TEXT, "", false )
         change_internal ()
         change_unsaveable ()
-    add_bool( "save-config", false, NULL, SAVE_CONFIG_TEXT, "",
-              false )
-        change_internal ()
-        change_unsaveable ()
+    add_obsolete_bool( "save-config" )
     add_bool( "reset-config", false, NULL, RESET_CONFIG_TEXT, "", false )
         change_internal ()
         change_unsaveable ()
diff --git a/src/libvlc.c b/src/libvlc.c
index b0feac1717..783cf5c17f 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -520,12 +520,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
             config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true );
             config_SaveConfigFile( p_libvlc, NULL );
         }
-        if( var_InheritBool( p_libvlc, "save-config" ) )
-        {
-            config_LoadConfigFile( p_libvlc, NULL );
-            config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true );
-            config_SaveConfigFile( p_libvlc, NULL );
-        }
     }
 
     if( module_count <= 1)