author | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
commit | 55ea6367fba8a82fbdca74599422717e4b3c3ec6 (patch) (unidiff) | |
tree | b40bb13a1b4f05b4eda61cf0c4a02e32719a70c4 /core/settings/security/security.cpp | |
parent | 56ad1eb7fb39ddc78026a0df096703fcf42f5a94 (diff) | |
download | opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.zip opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.gz opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.bz2 |
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 :(
Diffstat (limited to 'core/settings/security/security.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/security/security.cpp | 5 |
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 | |||
@@ -120,7 +120,6 @@ void Security::show() | |||
120 | //if ( passcode.isEmpty() ) | 120 | //if ( passcode.isEmpty() ) |
121 | //reject(); | 121 | //reject(); |
122 | } else { | 122 | } else { |
123 | |||
124 | if (!valid) // security passcode was not asked yet, so ask now | 123 | if (!valid) // security passcode was not asked yet, so ask now |
125 | { | 124 | { |
126 | QString pc = enterPassCode(tr("Enter passcode")); | 125 | QString pc = enterPassCode(tr("Enter passcode")); |
@@ -239,7 +238,6 @@ void Security::setSyncNet(const QString& sn) | |||
239 | void Security::applySecurity() | 238 | void Security::applySecurity() |
240 | { | 239 | { |
241 | if ( valid ) { | 240 | if ( valid ) { |
242 | |||
243 | Config cfg("Security"); | 241 | Config cfg("Security"); |
244 | cfg.setGroup("Passcode"); | 242 | cfg.setGroup("Passcode"); |
245 | cfg.writeEntry("passcode",passcode); | 243 | cfg.writeEntry("passcode",passcode); |
@@ -270,9 +268,6 @@ void Security::applySecurity() | |||
270 | loginCfg.removeEntry("AutoLogin"); | 268 | loginCfg.removeEntry("AutoLogin"); |
271 | } | 269 | } |
272 | 270 | ||
273 | cfg.setGroup("SyncMode"); | ||
274 | cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); | ||
275 | |||
276 | } | 271 | } |
277 | } | 272 | } |
278 | 273 | ||