-rw-r--r-- | core/launcher/serverapp.cpp | 8 |
1 files changed, 5 insertions, 3 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 | |||
@@ -25,5 +25,6 @@ | |||
25 | #include <opie2/odebug.h> | 25 | #include <opie2/odebug.h> |
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> |
29 | #include <qtopia/power.h> | 30 | #include <qtopia/power.h> |
@@ -351,4 +352,5 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) | |||
351 | /* make sure the event filter is installed */ | 352 | /* make sure the event filter is installed */ |
352 | const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 ); | 353 | const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 ); |
354 | Q_CONST_UNUSED( but ) | ||
353 | } | 355 | } |
354 | 356 | ||
@@ -497,5 +499,5 @@ 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 |
@@ -553,5 +555,5 @@ void ServerApplication::togglePower() | |||
553 | #ifdef QWS | 555 | #ifdef QWS |
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. |
557 | // But this would not show up fast enough | 559 | // But this would not show up fast enough |