misc. cleanups

2 files changed, 8 insertions, 8 deletions

diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp
index f24ebb3..63baaa6 100644
--- a/core/opie-login/loginwindowimpl.cpp
+++ b/core/opie-login/loginwindowimpl.cpp
@@ -29,16 +29,19 @@ extern "C" {
 #else
 #include <crypt.h>
 #include <shadow.h>
 #endif
 
 #include "loginwindowimpl.h"
 #include "inputmethods.h"
 
+using namespace Opie;
+
+
 LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose )
 {
 	QPopupMenu *pop = new QPopupMenu ( this );
 	pop-> insertItem ( tr( "Restart" ), this, SLOT( restart ( )));
 	pop-> insertItem ( tr( "Quit" ), this, SLOT( quit ( )));
 	m_menu-> setPopup ( pop );
 
 	QHBoxLayout *lay = new QHBoxLayout ( m_taskbar, 4, 4 );
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 718009a..df9451d 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -16,16 +16,18 @@
 #include <opie/odevice.h>
 
 #include <qwindowsystem_qws.h>
 #include <qfile.h>
 
 #include "loginwindowimpl.h"
 #include "calibrate.h"
 
+using namespace Opie;
+
 int login_main ( int argc, char **argv );
 void sigusr1 ( int sig );
 void exit_closelog ( );
 
 
 
 int main ( int argc, char **argv )
 {
@@ -85,24 +87,24 @@ public:
   LoginScreenSaver ( )
   {
     m_lcd_status = true;
 
     m_backlight_bright = -1;
     m_backlight_forcedoff = false;
 
     // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off)
-    ODevice::inst ( ) -> setDisplayStatus ( true );
+    ODevice::inst ( )-> setDisplayStatus ( true );
   }
   void restore()
   {
     if ( !m_lcd_status )     // We must have turned it off
       ODevice::inst ( ) -> setDisplayStatus ( true );
 
-    setBacklight ( -1 );
+    setBacklight ( -3 );
   }
   bool save( int level )
   {
     switch ( level ) {
       case 0:
         if ( backlight() > 1 )
           setBacklight( 1 ); // lowest non-off
         return true;
@@ -184,35 +186,30 @@ int login_main ( int argc, char **argv )
 	QWSServer::setDesktopBackground( QImage() );
 	QPEApplication app ( argc, argv, QApplication::GuiServer );
 
 	app. setFont ( QFont ( "Helvetica", 10 ));
 	app. setStyle ( new QPEStyle ( ));
 
 	ODevice::inst ( )-> setSoftSuspend ( true );
 
-	{
-		QCopEnvelope e("QPE/System", "setBacklight(int)" );
-		e << -3; // Forced on
-	}
-
 #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
 	if ( !QFile::exists ( "/etc/pointercal" )) {
 		// Make sure calibration widget starts on top.
 		Calibrate *cal = new Calibrate;
 		cal-> exec ( );
 		delete cal;
 	}
 #endif
 
-
 	LoginScreenSaver *saver = new LoginScreenSaver;
 
 	saver-> setIntervals ( );
 	QWSServer::setScreenSaver ( saver );
+	saver-> restore ( );
 
 
 	LoginWindowImpl *lw = new LoginWindowImpl ( );
 	app. setMainWidget ( lw );
 	lw-> setGeometry ( 0, 0, app. desktop ( )-> width ( ), app. desktop ( )-> height ( ));
 	lw-> show ( );
 
 	int rc = app. exec ( );