summaryrefslogtreecommitdiff
path: root/core/opie-login/main.cpp
Unidiff
Diffstat (limited to 'core/opie-login/main.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/opie-login/main.cpp7
1 files changed, 1 insertions, 6 deletions
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
@@ -187,18 +187,17 @@ int main ( int argc, char **argv )
187 187
188 if ( !user. isEmpty ( )) 188 if ( !user. isEmpty ( ))
189 autolog = ::strdup ( user. latin1 ( )); 189 autolog = ::strdup ( user. latin1 ( ));
190 } 190 }
191 191
192 if ( autolog && !userExited ) { 192 if ( autolog && !userExited ) {
193 193
194 QWSServer::setDesktopBackground( QImage() ); 194 QWSServer::setDesktopBackground( QImage() );
195 ODevice::inst ( )-> setDisplayStatus ( true ); 195 ODevice::inst()->setDisplayStatus( true );
196 ODevice::inst ( )-> setSoftSuspend ( false );
197 LoginApplication *app = new LoginApplication ( argc, argv, ppid ); 196 LoginApplication *app = new LoginApplication ( argc, argv, ppid );
198 LoginApplication::setLoginAs ( autolog ); 197 LoginApplication::setLoginAs ( autolog );
199 198
200 199
201 if ( LoginApplication::changeIdentity ( )) 200 if ( LoginApplication::changeIdentity ( ))
202 ::exit ( LoginApplication::login ( )); 201 ::exit ( LoginApplication::login ( ));
203 else 202 else
204 ::exit ( 0 ); 203 ::exit ( 0 );
@@ -330,18 +329,16 @@ int login_main ( int argc, char **argv, pid_t ppid )
330 QWSServer::setDesktopBackground( QImage() ); 329 QWSServer::setDesktopBackground( QImage() );
331 LoginApplication *app = new LoginApplication ( argc, argv, ppid ); 330 LoginApplication *app = new LoginApplication ( argc, argv, ppid );
332 331
333 Opie::force_appearance = 0; 332 Opie::force_appearance = 0;
334 333
335 app-> setFont ( QFont ( "Helvetica", 10 )); 334 app-> setFont ( QFont ( "Helvetica", 10 ));
336 app-> setStyle ( new QPEStyle ( )); 335 app-> setStyle ( new QPEStyle ( ));
337 336
338 ODevice::inst ( )-> setSoftSuspend ( true );
339
340 if ( QWSServer::mouseHandler() && 337 if ( QWSServer::mouseHandler() &&
341 QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { 338 QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
342 if ( !QFile::exists ( "/etc/pointercal" )) { 339 if ( !QFile::exists ( "/etc/pointercal" )) {
343 // Make sure calibration widget starts on top. 340 // Make sure calibration widget starts on top.
344 Calibrate *cal = new Calibrate; 341 Calibrate *cal = new Calibrate;
345 cal-> exec ( ); 342 cal-> exec ( );
346 delete cal; 343 delete cal;
347 } 344 }
@@ -356,18 +353,16 @@ int login_main ( int argc, char **argv, pid_t ppid )
356 353
357 LoginWindowImpl *lw = new LoginWindowImpl ( ); 354 LoginWindowImpl *lw = new LoginWindowImpl ( );
358 app-> setMainWidget ( lw ); 355 app-> setMainWidget ( lw );
359 lw-> setGeometry ( 0, 0, app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( )); 356 lw-> setGeometry ( 0, 0, app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( ));
360 lw-> show ( ); 357 lw-> show ( );
361 358
362 int rc = app-> exec ( ); 359 int rc = app-> exec ( );
363 360
364 ODevice::inst ( )-> setSoftSuspend ( false );
365
366 if ( app-> loginAs ( )) { 361 if ( app-> loginAs ( )) {
367 if ( app-> changeIdentity ( )) { 362 if ( app-> changeIdentity ( )) {
368 app-> login ( ); 363 app-> login ( );
369 364
370 // if login succeeds, it never comes back 365 // if login succeeds, it never comes back
371 366
372 QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not start Opie." )); 367 QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not start Opie." ));
373 rc = 1; 368 rc = 1;