From 9b5be1aa88f98bfe939563898e8fa340dbb7fa3f Mon Sep 17 00:00:00 2001
From: zecke <zecke>
Date: Sat, 17 Jul 2004 17:51:32 +0000
Subject: -Add depedenncy on OMAF

-Link against OMAF
-Finally use OMAF
---
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 )
 }
 
 
@@ -495,11 +497,11 @@ bool ServerApplication::screenLocked()
 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
     }
 }
@@ -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 ( );
--
cgit v0.9.0.2