-rw-r--r-- | core/settings/security/security.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index 00ea105..42a39c2 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp | |||
@@ -236,13 +236,13 @@ void Security::setSyncNet(const QString& sn) | |||
236 | selectNet(auth_peer,auth_peer_bits); | 236 | selectNet(auth_peer,auth_peer_bits); |
237 | } | 237 | } |
238 | 238 | ||
239 | void Security::applySecurity() | 239 | void Security::applySecurity() |
240 | { | 240 | { |
241 | if ( valid ) { | 241 | if ( valid ) { |
242 | <<<<<<< security.cpp | 242 | |
243 | Config cfg("Security"); | 243 | Config cfg("Security"); |
244 | cfg.setGroup("Passcode"); | 244 | cfg.setGroup("Passcode"); |
245 | cfg.writeEntry("passcode",passcode); | 245 | cfg.writeEntry("passcode",passcode); |
246 | cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked()); | 246 | cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked()); |
247 | cfg.setGroup("Sync"); | 247 | cfg.setGroup("Sync"); |
248 | int auth_peer=0; | 248 | int auth_peer=0; |