author | paule <paule> | 2007-01-31 05:11:56 (UTC) |
---|---|---|
committer | paule <paule> | 2007-01-31 05:11:56 (UTC) |
commit | 3a2db1ba1395a6d33de421ed5f3b04df53ced5bc (patch) (unidiff) | |
tree | 19af403919546824965303db78820a3f2a176bda /core | |
parent | f4e6ede30d494ad91fdbd0fd72498ef3a44bf7ee (diff) | |
download | opie-3a2db1ba1395a6d33de421ed5f3b04df53ced5bc.zip opie-3a2db1ba1395a6d33de421ed5f3b04df53ced5bc.tar.gz opie-3a2db1ba1395a6d33de421ed5f3b04df53ced5bc.tar.bz2 |
Specify correct parameters to needToAuthenticate() and login() so that appropriate setting is read when determining whether to authenticate or not. Fixes bug #1830.
-rw-r--r-- | core/launcher/serverapp.cpp | 4 |
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 | |||
@@ -569,44 +569,44 @@ void ServerApplication::togglePower() | |||
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 | ||
608 | void ServerApplication::toggleLight() | 608 | void 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 |