summaryrefslogtreecommitdiff
authorzecke <zecke>2004-07-17 17:51:32 (UTC)
committer zecke <zecke>2004-07-17 17:51:32 (UTC)
commit9b5be1aa88f98bfe939563898e8fa340dbb7fa3f (patch) (side-by-side diff)
treedf938b8250e003b44f75c0fc0dedac2dbc782ddf
parent0f64024dc631d9043d2f6f4f6bcafaac7eddd545 (diff)
downloadopie-9b5be1aa88f98bfe939563898e8fa340dbb7fa3f.zip
opie-9b5be1aa88f98bfe939563898e8fa340dbb7fa3f.tar.gz
opie-9b5be1aa88f98bfe939563898e8fa340dbb7fa3f.tar.bz2
-Add depedenncy on OMAF
-Link against OMAF -Finally use OMAF
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/config.in2
-rw-r--r--core/launcher/server.pro2
-rw-r--r--core/launcher/serverapp.cpp8
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
@@ -1,4 +1,4 @@
config LAUNCHER
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
@@ -74,7 +74,7 @@ DEPENDPATH += $(OPIEDIR)/rsync
INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount
DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount
-LIBS += -lqpe -lopiecore2 -lopieui2 -lqrsync
+LIBS += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
TARGET = qpe
contains( $(CONFIG_TARGET_MACOSX), y ) {
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
@@ -24,7 +24,8 @@
/* OPIE */
#include <opie2/odebug.h>
#include <opie2/odevice.h>
-#include <qtopia/password.h>
+#include <opie2/multiauthpassword.h>
+
#include <qtopia/config.h>
#include <qtopia/power.h>
@@ -350,6 +351,7 @@ 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,7 +498,7 @@ void ServerApplication::login(bool at_poweron)
{
if ( !loggedin ) {
Global::terminateBuiltin("calibrate"); // No tr
- Password::authenticate(at_poweron);
+ Opie::Security::MultiauthPassword::authenticate(at_poweron);
loggedin=1;
#ifndef QT_NO_COP
QCopEnvelope e( "QPE/Desktop", "unlocked()" );
@@ -552,7 +554,7 @@ 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
QGfx *g = qt_screen-> screenGfx ( );