-Add depedenncy on OMAF

-Link against OMAF
-Finally use OMAF

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
@@ -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
@@ -69,16 +69,16 @@ INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
         DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate
 
 INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync
         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 ) {
   LIBS += -lcrypt
 }
 
 include ( $(OPIEDIR)/include.pro )
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
@@ -19,17 +19,18 @@
 **********************************************************************/
 
 #include "serverapp.h"
 #include "screensaver.h"
 
 /* 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>
 
 #ifdef Q_WS_QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 #include <qtopia/global.h>
 using namespace Opie::Core;
@@ -345,16 +346,17 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
 
     serverApp = this;
 
     apmTimeout();
     grabKeyboard();
 
     /* make sure the event filter is installed */
     const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 );
+    Q_CONST_UNUSED( but )
 }
 
 
 ServerApplication::~ServerApplication()
 {
     ungrabKeyboard();
 
 
@@ -490,21 +492,21 @@ void ServerApplication::launcherMessage( const QCString & msg, const QByteArray
 bool ServerApplication::screenLocked()
 {
     return loggedin == 0;
 }
 
 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
     }
 }
 
 #if defined(QPE_HAVE_TOGGLELIGHT)
 #include <qtopia/config.h>
 
 #include <sys/ioctl.h>
@@ -547,17 +549,17 @@ void ServerApplication::togglePower()
     excllock = true;
 
     bool wasloggedin = loggedin;
     loggedin = 0;
     m_suspendTime = QDateTime::currentDateTime();
 
 #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 ( );
         g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( ));
         delete g;
     }
 #endif