summaryrefslogtreecommitdiff
Unidiff
Diffstat (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" {
34#include "loginwindowimpl.h" 34#include "loginwindowimpl.h"
35#include "inputmethods.h" 35#include "inputmethods.h"
36 36
37using namespace Opie;
38
39
37LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose ) 40LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose )
38{ 41{
39 QPopupMenu *pop = new QPopupMenu ( this ); 42 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 @@
21#include "loginwindowimpl.h" 21#include "loginwindowimpl.h"
22#include "calibrate.h" 22#include "calibrate.h"
23 23
24using namespace Opie;
25
24int login_main ( int argc, char **argv ); 26int login_main ( int argc, char **argv );
25void sigusr1 ( int sig ); 27void sigusr1 ( int sig );
26void exit_closelog ( ); 28void exit_closelog ( );
@@ -90,14 +92,14 @@ public:
90 m_backlight_forcedoff = false; 92 m_backlight_forcedoff = false;
91 93
92 // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off) 94 // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off)
93 ODevice::inst ( ) -> setDisplayStatus ( true ); 95 ODevice::inst ( )-> setDisplayStatus ( true );
94 } 96 }
95 void restore() 97 void restore()
96 { 98 {
97 if ( !m_lcd_status ) // We must have turned it off 99 if ( !m_lcd_status ) // We must have turned it off
98 ODevice::inst ( ) -> setDisplayStatus ( true ); 100 ODevice::inst ( ) -> setDisplayStatus ( true );
99 101
100 setBacklight ( -1 ); 102 setBacklight ( -3 );
101 } 103 }
102 bool save( int level ) 104 bool save( int level )
103 { 105 {
@@ -189,11 +191,6 @@ int login_main ( int argc, char **argv )
189 191
190 ODevice::inst ( )-> setSoftSuspend ( true ); 192 ODevice::inst ( )-> setSoftSuspend ( true );
191 193
192 {
193 QCopEnvelope e("QPE/System", "setBacklight(int)" );
194 e << -3; // Forced on
195 }
196
197#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 194#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
198 if ( !QFile::exists ( "/etc/pointercal" )) { 195 if ( !QFile::exists ( "/etc/pointercal" )) {
199 // Make sure calibration widget starts on top. 196 // Make sure calibration widget starts on top.
@@ -203,11 +200,11 @@ int login_main ( int argc, char **argv )
203 } 200 }
204#endif 201#endif
205 202
206
207 LoginScreenSaver *saver = new LoginScreenSaver; 203 LoginScreenSaver *saver = new LoginScreenSaver;
208 204
209 saver-> setIntervals ( ); 205 saver-> setIntervals ( );
210 QWSServer::setScreenSaver ( saver ); 206 QWSServer::setScreenSaver ( saver );
207 saver-> restore ( );
211 208
212 209
213 LoginWindowImpl *lw = new LoginWindowImpl ( ); 210 LoginWindowImpl *lw = new LoginWindowImpl ( );