| -rw-r--r-- | core/launcher/main.cpp | 7 | ||||
| -rw-r--r-- | core/opie-login/main.cpp | 7 |
2 files changed, 1 insertions, 13 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 734d072..5bbed59 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp @@ -157,11 +157,8 @@ int initApplication( int argc, char ** argv ) a.restart(); return 0; } -#ifndef Q_OS_MACX - ODevice::inst()->setSoftSuspend( true ); -#endif { QCopEnvelope e("QPE/System", "setBacklight(int)" ); e << -3; // Forced on } @@ -194,12 +191,8 @@ int initApplication( int argc, char ** argv ) remove_pidfile(); odebug << "removing server object..." << oendl; delete s; -#ifndef Q_OS_MACX - ODevice::inst()->setSoftSuspend( false ); -#endif - odebug << "returning from qpe/initapplication..." << oendl; return rv; } diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index 0699d0a..2de0180 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp @@ -191,10 +191,9 @@ int main ( int argc, char **argv ) if ( autolog && !userExited ) { QWSServer::setDesktopBackground( QImage() ); - ODevice::inst ( )-> setDisplayStatus ( true ); - ODevice::inst ( )-> setSoftSuspend ( false ); + ODevice::inst()->setDisplayStatus( true ); LoginApplication *app = new LoginApplication ( argc, argv, ppid ); LoginApplication::setLoginAs ( autolog ); @@ -334,10 +333,8 @@ int login_main ( int argc, char **argv, pid_t ppid ) app-> setFont ( QFont ( "Helvetica", 10 )); app-> setStyle ( new QPEStyle ( )); - ODevice::inst ( )-> setSoftSuspend ( true ); - if ( QWSServer::mouseHandler() && QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { if ( !QFile::exists ( "/etc/pointercal" )) { // Make sure calibration widget starts on top. @@ -360,10 +357,8 @@ int login_main ( int argc, char **argv, pid_t ppid ) lw-> show ( ); int rc = app-> exec ( ); - ODevice::inst ( )-> setSoftSuspend ( false ); - if ( app-> loginAs ( )) { if ( app-> changeIdentity ( )) { app-> login ( ); |