merge core/settings/*

- light-and-power and security were a bit ugly, so I recommend someone
  who actually dealt with these files looking into if I got it right
  (not to tell about the frustratation about the fact that the ones who
  dealt with these files didn't do the merge in the first place :(

1 files changed, 0 insertions, 5 deletions

diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index 42a39c2..81363d2 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -117,13 +117,12 @@ void Security::show()
     if ( passcode.isEmpty() ) {
         // could insist...
         //changePassCode();
         //if ( passcode.isEmpty() )
         //reject();
     } else {
-
 		if (!valid) // security passcode was not asked yet, so ask now
 		{
 			QString pc = enterPassCode(tr("Enter passcode"));
 			if ( pc != passcode ) {
 				QMessageBox::critical(this, tr("Passcode incorrect"),
 						tr("The passcode entered is incorrect.\nAccess denied"));
@@ -236,13 +235,12 @@ void Security::setSyncNet(const QString& sn)
     selectNet(auth_peer,auth_peer_bits);
 }
 
 void Security::applySecurity()
 {
     if ( valid ) {
-
         Config cfg("Security");
         cfg.setGroup("Passcode");
         cfg.writeEntry("passcode",passcode);
         cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked());
         cfg.setGroup("Sync");
         int auth_peer=0;
@@ -267,15 +265,12 @@ void Security::applySecurity()
         if (autoLogin) {
             loginCfg.writeEntry("AutoLogin",autoLoginName);
         } else {
             loginCfg.removeEntry("AutoLogin");
         }
 
-	cfg.setGroup("SyncMode");
-	cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 );
-
     }
 }
 
 void Security::changeLoginName( int idx )
 {
     autoLoginName = userlist->text(idx);;