author | paule <paule> | 2007-01-29 07:15:46 (UTC) |
---|---|---|
committer | paule <paule> | 2007-01-29 07:15:46 (UTC) |
commit | 5a58a5974cb4dd017e6989d5ebca876b5764b0df (patch) (side-by-side diff) | |
tree | 49fa0c52d539b7de5abf4bf27cc424ad4d2e0401 | |
parent | 865225eccc619cbd196d181e80ef27167b124090 (diff) | |
download | opie-5a58a5974cb4dd017e6989d5ebca876b5764b0df.zip opie-5a58a5974cb4dd017e6989d5ebca876b5764b0df.tar.gz opie-5a58a5974cb4dd017e6989d5ebca876b5764b0df.tar.bz2 |
Fix needToAuthenticate() so that its operation matches the doc comments
-rw-r--r-- | libopie2/opiesecurity/multiauthpassword.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libopie2/opiesecurity/multiauthpassword.cpp b/libopie2/opiesecurity/multiauthpassword.cpp index 6c8944e..fb468d1 100644 --- a/libopie2/opiesecurity/multiauthpassword.cpp +++ b/libopie2/opiesecurity/multiauthpassword.cpp @@ -34,67 +34,67 @@ /* OPIE */ #include <opie2/multiauthcommon.h> #include <opie2/multiauthmainwindow.h> #include <qpe/config.h> #include <qpe/qlibrary.h> #include <qpe/qcom.h> /* QT */ #include <qapplication.h> #include <qvbox.h> #include <qpushbutton.h> #include <qlabel.h> #include <qdir.h> #include "multiauthpassword.h" namespace Opie { namespace Security { /** * Tells if the users requires authentication (used internally to * know whether to repaint the screen on resume) * * \param at_poweron true if we are booting Opie, false if we are resuming it * \return true if authenticate() launched right now would trigger an authentication */ bool MultiauthPassword::needToAuthenticate(bool at_poweron) { Config cfg("Security"); cfg.setGroup("Misc"); - if ( !at_poweron && cfg.readBoolEntry("onStart", false) ) + if ( at_poweron && cfg.readBoolEntry("onStart", false) ) return true; - else if ( at_poweron && cfg.readBoolEntry("onResume", false) ) + else if ( !at_poweron && cfg.readBoolEntry("onResume", false) ) return true; else return false; } /** * \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"); |