summaryrefslogtreecommitdiff
authorzecke <zecke>2004-10-12 14:59:06 (UTC)
committer zecke <zecke>2004-10-12 14:59:06 (UTC)
commit4eed63767cedb0d96b116c4b9233405ca93e5541 (patch) (unidiff)
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)
85 */ 85 */
86void MultiauthPassword::authenticate(int lockMode) 86void MultiauthPassword::authenticate(int lockMode)
87{ 87{
88 /** 88 /**
89 * \par Conditions 89 * \par Conditions
90 * 90 *
91 * If lockMode is an If, it's conditional: 91 * If lockMode is an If, it's conditional:
@@ -99,9 +99,9 @@ void MultiauthPassword::authenticate(int lockMode)
99 Config cfg("Security"); 99 Config cfg("Security");
100 cfg.setGroup("Misc"); 100 cfg.setGroup("Misc");
101 if ( ( 101 if ( (
102 (lockMode == IfPowerOn) && cfg.readBoolEntry("onStart", false) 102 (lockMode == IfPowerOn) && !cfg.readBoolEntry("onStart", false)
103 ) || ( 103 ) || (
104 (lockMode == IfResume) && cfg.readBoolEntry("onResume", false) 104 (lockMode == IfResume) && !cfg.readBoolEntry("onResume", false)
105 ) ) 105 ) )
106 return; 106 return;
107 } 107 }
@@ -114,7 +114,7 @@ void MultiauthPassword::authenticate(int lockMode)
114 * people escape. 114 * people escape.
115 */ 115 */
116 bool allowByPass = false; 116 bool allowByPass = false;
117 117
118 if (lockMode == TestNow) 118 if (lockMode == TestNow)
119 allowByPass = true; 119 allowByPass = true;
120 120