summaryrefslogtreecommitdiff
path: root/libopie2/opiesecurity
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 /libopie2/opiesecurity
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 (limited to 'libopie2/opiesecurity') (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
@@ -76,54 +76,54 @@ bool MultiauthPassword::needToAuthenticate(bool at_poweron)
/**
* \brief Require (if configured so) user authentication to unlock and continue
*
* This method will check if you require authentication
* and then will lock the screen and ask for a successful
* authentication (explaining what it does or not, depending
* on your local configuration).
* It may go into an event loop, but anyhow it will only end
* when the user has successfully authenticated to the system.
*/
void MultiauthPassword::authenticate(int lockMode)
{
- /**
+ /**
* \par Conditions
*
* If lockMode is an If, it's conditional:
* \li IfPowerOn will not trigger an authentication if
* onStart is set to false in Security.conf,
* \li IfResume will not trigger an authentication if
* onResume is set to false in Security.conf.
*/
if ( (lockMode == IfPowerOn) || (lockMode == IfResume) )
{
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;
}
/**
* \li TestNow will ensure that the authentication window will let
* people escape through the last screen (which they can reach skipping
* all the authentication steps)
* \li LockNow will always go on with the authentication, and won't let
* people escape.
*/
bool allowByPass = false;
-
+
if (lockMode == TestNow)
allowByPass = true;
/* Constructs the main window, which displays messages and blocks
* access to the desktop
*/
MultiauthMainWindow win(allowByPass);
// resize the QDialog object so it fills all the screen
QRect desk = qApp->desktop()->geometry();
win.setGeometry( 0, 0, desk.width(), desk.height() );