1 files changed, 23 insertions, 11 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 0e60839..d74b745 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -182,5 +182,5 @@ public:
     }
 
-    setBacklight ( -3 );
+    setBacklight ( -1 );
   }
   bool save( int level )
@@ -333,10 +333,12 @@ void DesktopApplication::switchLCD ( bool on )
 
     if ( dapp-> m_screensaver ) {
-      if ( on )
-      dapp-> m_screensaver-> restore ( ); //setBacklight ( on ? -3 : -1 );
-    else
-      dapp-> m_screensaver-> save ( 1 );
-    
-  }
+      if ( on ) {
+        dapp-> m_screensaver-> setDisplayState ( true ); 
+        dapp-> m_screensaver-> setBacklight ( -3 );
+      }
+      else {
+        dapp-> m_screensaver-> setDisplayState ( false );
+      }
+    }
   }
 }
@@ -863,5 +865,5 @@ void Desktop::togglePower()
 
   if ( excllock )
-    return ;
+    return;
 
   excllock = true;
@@ -871,8 +873,18 @@ void Desktop::togglePower()
   suspendTime = QDateTime::currentDateTime();
 
-  ODevice::inst ( ) -> suspend ( );
+#ifdef QWS
+  if ( Password::needToAuthenticate ( true ) && qt_screen ) {
+    // Should use a big black window instead.
+    // But this would not show up fast enough
+    QGfx *g = qt_screen-> screenGfx ( );
+    g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( ));
+    delete g;
+  }
+#endif
+
+  ODevice::inst ( )-> suspend ( );
 
-  QWSServer::screenSaverActivate ( false );
   DesktopApplication::switchLCD ( true ); // force LCD on without slow qcop call
+  QWSServer::screenSaverActivate ( false );
 
   {
@@ -881,5 +893,5 @@ void Desktop::togglePower()
 
   if ( wasloggedin )
-    login( TRUE );
+    login ( true );
 
   execAutoStart();