summaryrefslogtreecommitdiff
authorzecke <zecke>2004-10-12 14:59:06 (UTC)
committer zecke <zecke>2004-10-12 14:59:06 (UTC)
commit4eed63767cedb0d96b116c4b9233405ca93e5541 (patch) (side-by-side diff)
tree0c4157b445a1536a43e9fc49217327f8a13df8a5
parentd557d195e8f89f521be8a5b7a0bd071261bb2dbf (diff)
downloadopie-4eed63767cedb0d96b116c4b9233405ca93e5541.zip
opie-4eed63767cedb0d96b116c4b9233405ca93e5541.tar.gz
opie-4eed63767cedb0d96b116c4b9233405ca93e5541.tar.bz2
-Skip showing the Security screen if onResume or onPoweron is set to false
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiesecurity/multiauthpassword.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libopie2/opiesecurity/multiauthpassword.cpp b/libopie2/opiesecurity/multiauthpassword.cpp
index 8eda554..6c8944e 100644
--- a/libopie2/opiesecurity/multiauthpassword.cpp
+++ b/libopie2/opiesecurity/multiauthpassword.cpp
@@ -85,7 +85,7 @@ bool MultiauthPassword::needToAuthenticate(bool at_poweron)
*/
void MultiauthPassword::authenticate(int lockMode)
{
- /**
+ /**
* \par Conditions
*
* If lockMode is an If, it's conditional:
@@ -99,9 +99,9 @@ void MultiauthPassword::authenticate(int lockMode)
Config cfg("Security");
cfg.setGroup("Misc");
if ( (
- (lockMode == IfPowerOn) && cfg.readBoolEntry("onStart", false)
+ (lockMode == IfPowerOn) && !cfg.readBoolEntry("onStart", false)
) || (
- (lockMode == IfResume) && cfg.readBoolEntry("onResume", false)
+ (lockMode == IfResume) && !cfg.readBoolEntry("onResume", false)
) )
return;
}
@@ -114,7 +114,7 @@ void MultiauthPassword::authenticate(int lockMode)
* people escape.
*/
bool allowByPass = false;
-
+
if (lockMode == TestNow)
allowByPass = true;