-rw-r--r-- | core/launcher/serverapp.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp index 3d88873..f1bce40 100644 --- a/core/launcher/serverapp.cpp +++ b/core/launcher/serverapp.cpp | |||
@@ -26,3 +26,4 @@ | |||
26 | #include <opie2/odevice.h> | 26 | #include <opie2/odevice.h> |
27 | #include <qtopia/password.h> | 27 | #include <opie2/multiauthpassword.h> |
28 | |||
28 | #include <qtopia/config.h> | 29 | #include <qtopia/config.h> |
@@ -352,2 +353,3 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) | |||
352 | const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 ); | 353 | const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 ); |
354 | Q_CONST_UNUSED( but ) | ||
353 | } | 355 | } |
@@ -497,7 +499,7 @@ void ServerApplication::login(bool at_poweron) | |||
497 | if ( !loggedin ) { | 499 | if ( !loggedin ) { |
498 | Global::terminateBuiltin("calibrate"); // No tr | 500 | Global::terminateBuiltin("calibrate"); // No tr |
499 | Password::authenticate(at_poweron); | 501 | Opie::Security::MultiauthPassword::authenticate(at_poweron); |
500 | loggedin=1; | 502 | loggedin=1; |
501 | #ifndef QT_NO_COP | 503 | #ifndef QT_NO_COP |
502 | QCopEnvelope e( "QPE/Desktop", "unlocked()" ); | 504 | QCopEnvelope e( "QPE/Desktop", "unlocked()" ); |
503 | #endif | 505 | #endif |
@@ -554,3 +556,3 @@ void ServerApplication::togglePower() | |||
554 | 556 | ||
555 | if ( Password::needToAuthenticate ( true ) && qt_screen ) { | 557 | if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) { |
556 | // Should use a big black window instead. | 558 | // Should use a big black window instead. |