author | llornkcor <llornkcor> | 2003-11-05 10:41:28 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-11-05 10:41:28 (UTC) |
commit | e6bb5b92e21ad08d00e399f30abeaea22f08ca18 (patch) (unidiff) | |
tree | abfaef874a2c729340ba04d9d94c4a0be0955165 | |
parent | 15163234024750178829812f31a1e7173a66fa1d (diff) | |
download | opie-e6bb5b92e21ad08d00e399f30abeaea22f08ca18.zip opie-e6bb5b92e21ad08d00e399f30abeaea22f08ca18.tar.gz opie-e6bb5b92e21ad08d00e399f30abeaea22f08ca18.tar.bz2 |
remove <<<<<<
-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 | |||
@@ -210,65 +210,65 @@ void Security::loadUsers ( void ) | |||
210 | userlist->insertItem(*account.at(0)); | 210 | userlist->insertItem(*account.at(0)); |
211 | // Highlight this item if it is set to autologinToggle | 211 | // Highlight this item if it is set to autologinToggle |
212 | if ( *account.at(0) == autoLoginName) | 212 | if ( *account.at(0) == autoLoginName) |
213 | userlist->setCurrentItem(userlist->count()-1); | 213 | userlist->setCurrentItem(userlist->count()-1); |
214 | } | 214 | } |
215 | } | 215 | } |
216 | passwd.close(); | 216 | passwd.close(); |
217 | } | 217 | } |
218 | 218 | ||
219 | } | 219 | } |
220 | 220 | ||
221 | void Security::toggleAutoLogin(bool val) | 221 | void Security::toggleAutoLogin(bool val) |
222 | { | 222 | { |
223 | autoLogin=val; | 223 | autoLogin=val; |
224 | userlist->setEnabled(val); | 224 | userlist->setEnabled(val); |
225 | if (!autoLogin) | 225 | if (!autoLogin) |
226 | autoLoginName=userlist->currentText(); | 226 | autoLoginName=userlist->currentText(); |
227 | } | 227 | } |
228 | 228 | ||
229 | 229 | ||
230 | 230 | ||
231 | 231 | ||
232 | void Security::setSyncNet(const QString& sn) | 232 | void Security::setSyncNet(const QString& sn) |
233 | { | 233 | { |
234 | int auth_peer,auth_peer_bits; | 234 | int auth_peer,auth_peer_bits; |
235 | parseNet(sn,auth_peer,auth_peer_bits); | 235 | parseNet(sn,auth_peer,auth_peer_bits); |
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; |
249 | int auth_peer_bits; | 249 | int auth_peer_bits; |
250 | QString sn = syncnet->currentText(); | 250 | QString sn = syncnet->currentText(); |
251 | parseNet(sn,auth_peer,auth_peer_bits); | 251 | parseNet(sn,auth_peer,auth_peer_bits); |
252 | cfg.writeEntry("auth_peer",auth_peer); | 252 | cfg.writeEntry("auth_peer",auth_peer); |
253 | cfg.writeEntry("auth_peer_bits",auth_peer_bits); | 253 | cfg.writeEntry("auth_peer_bits",auth_peer_bits); |
254 | /* | 254 | /* |
255 | cfg.setGroup("Remote"); | 255 | cfg.setGroup("Remote"); |
256 | if ( telnetAvailable() ) | 256 | if ( telnetAvailable() ) |
257 | cfg.writeEntry("allow_telnet",telnet->isChecked()); | 257 | cfg.writeEntry("allow_telnet",telnet->isChecked()); |
258 | if ( sshAvailable() ) | 258 | if ( sshAvailable() ) |
259 | cfg.writeEntry("allow_ssh",ssh->isChecked()); | 259 | cfg.writeEntry("allow_ssh",ssh->isChecked()); |
260 | // ### write ssh/telnet sys config files | 260 | // ### write ssh/telnet sys config files |
261 | */ | 261 | */ |
262 | 262 | ||
263 | QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf"; | 263 | QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf"; |
264 | Config loginCfg(configFile,Config::File); | 264 | Config loginCfg(configFile,Config::File); |
265 | loginCfg.setGroup("General"); | 265 | loginCfg.setGroup("General"); |
266 | 266 | ||
267 | if (autoLogin) { | 267 | if (autoLogin) { |
268 | loginCfg.writeEntry("AutoLogin",autoLoginName); | 268 | loginCfg.writeEntry("AutoLogin",autoLoginName); |
269 | } else { | 269 | } else { |
270 | loginCfg.removeEntry("AutoLogin"); | 270 | loginCfg.removeEntry("AutoLogin"); |
271 | } | 271 | } |
272 | 272 | ||
273 | cfg.setGroup("SyncMode"); | 273 | cfg.setGroup("SyncMode"); |
274 | cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); | 274 | cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); |