| -rw-r--r-- | core/launcher/config.in | 2 | ||||
| -rw-r--r-- | core/launcher/server.pro | 2 | ||||
| -rw-r--r-- | core/launcher/serverapp.cpp | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/core/launcher/config.in b/core/launcher/config.in index 31da148..a11fed4 100644 --- a/core/launcher/config.in +++ b/core/launcher/config.in @@ -3,2 +3,2 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQRSYNC + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2SECURITY && LIBQRSYNC diff --git a/core/launcher/server.pro b/core/launcher/server.pro index 4e6a581..f366f54 100644 --- a/core/launcher/server.pro +++ b/core/launcher/server.pro @@ -76,3 +76,3 @@ DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount -LIBS += -lqpe -lopiecore2 -lopieui2 -lqrsync +LIBS += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync TARGET = qpe 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 @@ #include <opie2/odevice.h> -#include <qtopia/password.h> +#include <opie2/multiauthpassword.h> + #include <qtopia/config.h> @@ -352,2 +353,3 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 ); + Q_CONST_UNUSED( but ) } @@ -498,3 +500,3 @@ void ServerApplication::login(bool at_poweron) Global::terminateBuiltin("calibrate"); // No tr - Password::authenticate(at_poweron); + Opie::Security::MultiauthPassword::authenticate(at_poweron); loggedin=1; @@ -554,3 +556,3 @@ void ServerApplication::togglePower() - if ( Password::needToAuthenticate ( true ) && qt_screen ) { + if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) { // Should use a big black window instead. |