Keep only 'local' Config instances to avoid some older

instance reverting changes! (weakness of Config class)

1 files changed, 26 insertions, 26 deletions

diff --git a/core/settings/security/multiauthconfig.cpp b/core/settings/security/multiauthconfig.cpp
index 45d691b..7a5f7b9 100644
--- a/core/settings/security/multiauthconfig.cpp
+++ b/core/settings/security/multiauthconfig.cpp
@@ -159,3 +159,3 @@ static void test_and_start() {
     QStringList list = dir.entryList();
-    
+
     m_pluginsInstalled = ! list.isEmpty();
@@ -277,4 +277,2 @@ MultiauthConfig::~MultiauthConfig()
 void MultiauthConfig::writeConfigs() {
-    writeConfig();
-
     MultiauthConfigWidget* confWidget = 0;
@@ -283,2 +281,4 @@ void MultiauthConfig::writeConfigs() {
         confWidget->writeConfig();
+	
+    writeConfig();
 }
@@ -401,3 +401,3 @@ void MultiauthConfig::writeConfig()
 {
-    Config* pcfg = new Config("Security");
+    Config pcfg("Security");
 
@@ -405,3 +405,3 @@ void MultiauthConfig::writeConfig()
     {
-        pcfg->setGroup( "Plugins" );
+        pcfg.setGroup( "Plugins" );
         QStringList exclude;
@@ -426,12 +426,12 @@ void MultiauthConfig::writeConfig()
         }
-        pcfg->writeEntry( "ExcludePlugins", exclude, ',' );
-        pcfg->writeEntry( "IncludePlugins", include, ',' );
-        pcfg->writeEntry( "AllPlugins",  allPlugins, ',' );
-
-        pcfg->setGroup( "Misc" );
-        pcfg->writeEntry( "onStart",  m_generalConfig->m_onStart->isChecked() );
-        pcfg->writeEntry( "onResume",  m_generalConfig->m_onResume->isChecked() );
-        pcfg->writeEntry( "nbSuccessMin",  m_generalConfig->m_nbSuccessMin->text() );
-        pcfg->writeEntry( "noProtectConfig",  m_generalConfig->m_noProtectConfig->isChecked() );
-        pcfg->writeEntry( "explanScreens",  m_generalConfig->m_explanScreens->isChecked() );
+        pcfg.writeEntry( "ExcludePlugins", exclude, ',' );
+        pcfg.writeEntry( "IncludePlugins", include, ',' );
+        pcfg.writeEntry( "AllPlugins",  allPlugins, ',' );
+
+        pcfg.setGroup( "Misc" );
+        pcfg.writeEntry( "onStart",  m_generalConfig->m_onStart->isChecked() );
+        pcfg.writeEntry( "onResume",  m_generalConfig->m_onResume->isChecked() );
+        pcfg.writeEntry( "nbSuccessMin",  m_generalConfig->m_nbSuccessMin->text() );
+        pcfg.writeEntry( "noProtectConfig",  m_generalConfig->m_noProtectConfig->isChecked() );
+        pcfg.writeEntry( "explanScreens",  m_generalConfig->m_explanScreens->isChecked() );
     }
@@ -440,3 +440,3 @@ void MultiauthConfig::writeConfig()
 
-    pcfg->setGroup("Sync");
+    pcfg.setGroup("Sync");
     int auth_peer=0;
@@ -447,4 +447,4 @@ void MultiauthConfig::writeConfig()
     //this is the *selected* (active) net range
-    pcfg->writeEntry("auth_peer",auth_peer);
-    pcfg->writeEntry("auth_peer_bits",auth_peer_bits);
+    pcfg.writeEntry("auth_peer",auth_peer);
+    pcfg.writeEntry("auth_peer_bits",auth_peer_bits);
 
@@ -455,5 +455,5 @@ void MultiauthConfig::writeConfig()
         if ( i < m_syncWidget->syncnet->count() )
-            pcfg->writeEntry(target, m_syncWidget->syncnet->text(i));
+            pcfg.writeEntry(target, m_syncWidget->syncnet->text(i));
         else // no more entry in the syncnet list -> we clear the line
-            pcfg->writeEntry(target, "");
+            pcfg.writeEntry(target, "");
     }
@@ -476,11 +476,11 @@ void MultiauthConfig::writeConfig()
     }
-    pcfg->setGroup("SyncMode");
-    pcfg->writeEntry( "Mode", value );
+    pcfg.setGroup("SyncMode");
+    pcfg.writeEntry( "Mode", value );
 
     /*
-       pcfg->setGroup("Remote");
+       pcfg.setGroup("Remote");
        if ( telnetAvailable() )
-       pcfg->writeEntry("allow_telnet",telnet->isChecked());
+       pcfg.writeEntry("allow_telnet",telnet->isChecked());
        if ( sshAvailable() )
-       pcfg->writeEntry("allow_ssh",ssh->isChecked());
+       pcfg.writeEntry("allow_ssh",ssh->isChecked());
     // ### write ssh/telnet sys config files
@@ -489,3 +489,3 @@ void MultiauthConfig::writeConfig()
     //release the Config handler
-    delete pcfg;
+    pcfg.write();