Diffstat (limited to 'core/settings/security/security.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | core/settings/security/security.cpp | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index c4726b3..00ea105 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp @@ -112,5 +112,5 @@ void Security::updateGUI() void Security::show() { - valid=FALSE; + //valid=FALSE; setEnabled(FALSE); SecurityBase::show(); @@ -121,11 +121,15 @@ void Security::show() //reject(); } else { - QString pc = enterPassCode(tr("Enter passcode")); - if ( pc != passcode ) { - QMessageBox::critical(this, tr("Passcode incorrect"), - tr("The passcode entered is incorrect.\nAccess denied")); - reject(); - return; - } + + 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")); + reject(); + return; + } + } } setEnabled(TRUE); @@ -214,4 +218,5 @@ void Security::loadUsers ( void ) } + void Security::toggleAutoLogin(bool val) { @@ -221,4 +226,8 @@ void Security::toggleAutoLogin(bool val) autoLoginName=userlist->currentText(); } + + + + void Security::setSyncNet(const QString& sn) { @@ -231,4 +240,5 @@ void Security::applySecurity() { if ( valid ) { +<<<<<<< security.cpp Config cfg("Security"); cfg.setGroup("Passcode"); @@ -263,4 +273,5 @@ void Security::applySecurity() cfg.setGroup("SyncMode"); cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); + } } |