summaryrefslogtreecommitdiff
path: root/core
Side-by-side diff
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/opie-login/loginwindowimpl.cpp3
-rw-r--r--core/opie-login/main.cpp13
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
@@ -34,6 +34,9 @@ extern "C" {
#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 );
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
@@ -21,6 +21,8 @@
#include "loginwindowimpl.h"
#include "calibrate.h"
+using namespace Opie;
+
int login_main ( int argc, char **argv );
void sigusr1 ( int sig );
void exit_closelog ( );
@@ -90,14 +92,14 @@ public:
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 )
{
@@ -189,11 +191,6 @@ int login_main ( int argc, char **argv )
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.
@@ -203,11 +200,11 @@ int login_main ( int argc, char **argv )
}
#endif
-
LoginScreenSaver *saver = new LoginScreenSaver;
saver-> setIntervals ( );
QWSServer::setScreenSaver ( saver );
+ saver-> restore ( );
LoginWindowImpl *lw = new LoginWindowImpl ( );