- fix for bug #292 (Improper behaviour of frontlight disabling)

- fix for bug #199 (Desktop visible on resume before password dialog
  appears)

2 files changed, 23 insertions, 2 deletions

diff --git a/library/password.cpp b/library/password.cpp
index 4b22b65..6d126c4 100644
--- a/library/password.cpp
+++ b/library/password.cpp
@@ -24,13 +24,13 @@
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qtextview.h>
 #include <qstring.h>
 #include <qapplication.h>
 #include <qfile.h>
-#include <qwindowsystem_qws.h>
+//#include <qwindowsystem_qws.h>
 
 #include <qdialog.h>
 
 #include <unistd.h> //for sleep
 #include "passwordbase_p.h"
 
@@ -282,12 +282,31 @@ QString Password::getPassword( const QString& prompt )
 	return QString::null;
     }
 }
 
 
 /*!
+  Return if a prompt for the user's passcode is needed.
+
+  If \a at_poweron is TRUE, the dialog is only used if the user's
+  preference request it at poweron
+  
+  Opie extension to speed up suspend/resume.
+*/
+
+bool Password::needToAuthenticate(bool at_poweron)
+{
+    Config cfg("Security");
+    cfg.setGroup("Passcode");
+    QString passcode = cfg.readEntry("passcode");
+    
+    return ( !passcode.isEmpty()
+	    && (!at_poweron || cfg.readNumEntry("passcode_poweron",0)) );
+}
+
+/*!
   Prompt, fullscreen, for the user's passcode until they get it right.
 
   If \a at_poweron is TRUE, the dialog is only used if the user's
   preference request it at poweron; either way, the screen is always repainted
   by this function.  (this functionality may move to the caller of this function).
 */
@@ -321,13 +340,14 @@ void Password::authenticate(bool at_poweron)
 		oi->exec();
 	    pd.reset();
 	    pd.exec();
 	}
     } else if ( at_poweron ) {
 	// refresh screen   #### should probably be in caller
-	// Not needed (we took away the screen blacking)
+	// Not needed (we took away the screen blacking) TT
+	// Not needed (we have intelligent screen blacking) sandman
 	//if ( qwsServer )
 	    //qwsServer->refresh();
     }
 }
 
 #include "password.moc"
diff --git a/library/password.h b/library/password.h
index a3a3e45..a2f2c3c 100644
--- a/library/password.h
+++ b/library/password.h
@@ -22,11 +22,12 @@
 
 #include <qstring.h>
 
 class Password
 { 
 public:
+	static bool needToAuthenticate(bool atpoweron=FALSE); // Opie extension to speed up suspend/resume (sandman)
     static void authenticate(bool atpoweron=FALSE);
     static QString getPassword( const QString& prompt );
 };
 
 #endif // PASSWORD_H