summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/config.in2
-rw-r--r--core/launcher/server.pro2
-rw-r--r--core/launcher/serverapp.cpp14
3 files changed, 10 insertions, 8 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
@@ -2,3 +2,3 @@
boolean "opie-taskbar (program launcher qpe for Opie)"
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
@@ -75,5 +75,5 @@ INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount
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
@@ -25,5 +25,6 @@
#include <opie2/odebug.h>
#include <opie2/odevice.h>
-#include <qtopia/password.h>
+#include <opie2/multiauthpassword.h>
+
#include <qtopia/config.h>
#include <qtopia/power.h>
@@ -351,4 +352,5 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
/* make sure the event filter is installed */
const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 );
+ Q_CONST_UNUSED( but )
}
@@ -496,9 +498,9 @@ void ServerApplication::login(bool at_poweron)
{
if ( !loggedin ) {
- Global::terminateBuiltin("calibrate"); // No tr
- Password::authenticate(at_poweron);
- loggedin=1;
+ Global::terminateBuiltin("calibrate"); // No tr
+ Opie::Security::MultiauthPassword::authenticate(at_poweron);
+ loggedin=1;
#ifndef QT_NO_COP
- QCopEnvelope e( "QPE/Desktop", "unlocked()" );
+ QCopEnvelope e( "QPE/Desktop", "unlocked()" );
#endif
}
@@ -553,5 +555,5 @@ void ServerApplication::togglePower()
#ifdef QWS
- if ( Password::needToAuthenticate ( true ) && qt_screen ) {
+ if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) {
// Should use a big black window instead.
// But this would not show up fast enough