Diffstat (limited to 'core/settings/security/security.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | core/settings/security/security.cpp | 13 |
1 files changed, 12 insertions, 1 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 @@ -113,3 +113,3 @@ void Security::show() { - valid=FALSE; + //valid=FALSE; setEnabled(FALSE); @@ -122,2 +122,5 @@ void Security::show() } else { + + if (!valid) // security passcode was not asked yet, so ask now + { QString pc = enterPassCode(tr("Enter passcode")); @@ -130,2 +133,3 @@ void Security::show() } + } setEnabled(TRUE); @@ -215,2 +219,3 @@ void Security::loadUsers ( void ) } + void Security::toggleAutoLogin(bool val) @@ -222,2 +227,6 @@ void Security::toggleAutoLogin(bool val) } + + + + void Security::setSyncNet(const QString& sn) @@ -232,2 +241,3 @@ void Security::applySecurity() if ( valid ) { +<<<<<<< security.cpp Config cfg("Security"); @@ -264,2 +274,3 @@ void Security::applySecurity() cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); + } |