summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/serverapp.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index 6fe0479..0e92040 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -557,68 +557,68 @@ namespace {
557 // If the time between suspend and resume was longer then the 557 // If the time between suspend and resume was longer then the
558 // value saved as delay, start the app 558 // value saved as delay, start the app
559 if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) { 559 if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) {
560 QCopEnvelope e( "QPE/System", "execute(QString)" ); 560 QCopEnvelope e( "QPE/System", "execute(QString)" );
561 e << QString( appName ); 561 e << QString( appName );
562 } 562 }
563 } 563 }
564} 564}
565 565
566 566
567void ServerApplication::togglePower() 567void ServerApplication::togglePower()
568{ 568{
569 static bool excllock = false; 569 static bool excllock = false;
570 570
571 if ( excllock ) 571 if ( excllock )
572 return ; 572 return ;
573 573
574 excllock = true; 574 excllock = true;
575 575
576 bool wasloggedin = loggedin; 576 bool wasloggedin = loggedin;
577 loggedin = 0; 577 loggedin = 0;
578 m_suspendTime = QDateTime::currentDateTime(); 578 m_suspendTime = QDateTime::currentDateTime();
579 579
580#ifdef QWS 580#ifdef QWS
581 if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) { 581 if ( Opie::Security::MultiauthPassword::needToAuthenticate ( false ) && qt_screen ) {
582 // Should use a big black window instead. 582 // Should use a big black window instead.
583 // But this would not show up fast enough 583 // But this would not show up fast enough
584 QGfx *g = qt_screen-> screenGfx ( ); 584 QGfx *g = qt_screen-> screenGfx ( );
585 g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( )); 585 g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( ));
586 delete g; 586 delete g;
587 } 587 }
588#endif 588#endif
589 589
590 ODevice::inst ( )-> suspend ( ); 590 ODevice::inst ( )-> suspend ( );
591 591
592 ServerApplication::switchLCD ( true ); // force LCD on without slow qcop call 592 ServerApplication::switchLCD ( true ); // force LCD on without slow qcop call
593 QWSServer::screenSaverActivate ( false ); 593 QWSServer::screenSaverActivate ( false );
594 594
595 { 595 {
596 QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep 596 QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep
597 } 597 }
598 598
599 if ( wasloggedin ) 599 if ( wasloggedin )
600 login ( true ); 600 login ( false );
601 601
602 execAutoStart(m_suspendTime); 602 execAutoStart(m_suspendTime);
603 //qcopBridge->closeOpenConnections(); 603 //qcopBridge->closeOpenConnections();
604 604
605 excllock = false; 605 excllock = false;
606} 606}
607 607
608void ServerApplication::toggleLight() 608void ServerApplication::toggleLight()
609{ 609{
610#ifndef QT_NO_COP 610#ifndef QT_NO_COP
611 QCopEnvelope e("QPE/System", "setBacklight(int)"); 611 QCopEnvelope e("QPE/System", "setBacklight(int)");
612 e << -2; // toggle 612 e << -2; // toggle
613#endif 613#endif
614} 614}
615 615
616 616
617/* 617/*
618 * We still listen to key events but handle them in 618 * We still listen to key events but handle them in
619 * a special class 619 * a special class
620 */ 620 */
621 621
622bool ServerApplication::eventFilter( QObject *o, QEvent *e) { 622bool ServerApplication::eventFilter( QObject *o, QEvent *e) {
623 if ( e->type() != QEvent::KeyPress && 623 if ( e->type() != QEvent::KeyPress &&
624 e->type() != QEvent::KeyRelease ) 624 e->type() != QEvent::KeyRelease )