4 files changed, 19 insertions, 5 deletions

diff --git a/core/applets/multikeyapplet/config.in b/core/applets/multikeyapplet/config.in
index fc7affe..2e1a9e2 100644
--- a/core/applets/multikeyapplet/config.in
+++ b/core/applets/multikeyapplet/config.in
@@ -2,3 +2,3 @@
     boolean "opie-multikeyapplet (Applet to switch OnScreen keyboard layout)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && MULTIKEY
+    depends ( LIBQPE || LIBQPE-X11 ) && MULTIKEY
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp
index d304f54..b36ee12 100644
--- a/core/applets/multikeyapplet/multikey.cpp
+++ b/core/applets/multikeyapplet/multikey.cpp
@@ -15,4 +15,6 @@
 #include "multikey.h"
 
+/* OPIE */
+#include <opie2/otaskbarapplet.h>
 #include <qpe/global.h>
 #include <qpe/config.h>
@@ -20,4 +22,5 @@
 #include <qpe/qpeapplication.h>
 
+/* QT */
 #include <qlabel.h>
 #include <qdir.h>
@@ -113,5 +116,5 @@ void Multikey::message(const QCString &message, const QByteArray &data)
 
                     if (line.find(QRegExp("^sw\\s*=\\s*")) != -1) {
-                
+
                         if (i != sw.count()-1) {
                             if (keymap_map == current_map) {
@@ -135,2 +138,12 @@ void Multikey::message(const QCString &message, const QByteArray &data)
     }
 }
+
+int Multikey::position()
+{
+    return 10;
+}
+
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<Multikey> );
+}
diff --git a/core/applets/multikeyapplet/multikey.h b/core/applets/multikeyapplet/multikey.h
index 1c5aa0c..acddfc8 100644
--- a/core/applets/multikeyapplet/multikey.h
+++ b/core/applets/multikeyapplet/multikey.h
@@ -25,4 +25,5 @@ class Multikey: public QLabel
 public:
     Multikey(QWidget *parent);
+    static int position();
 
 protected:
diff --git a/core/applets/multikeyapplet/multikeyapplet.pro b/core/applets/multikeyapplet/multikeyapplet.pro
index 4be1f74..86e41c0 100644
--- a/core/applets/multikeyapplet/multikeyapplet.pro
+++ b/core/applets/multikeyapplet/multikeyapplet.pro
@@ -1,11 +1,11 @@
         TEMPLATE= lib
         CONFIG  += qt plugin warn_on release
-        HEADERS=   multikey.h multikeyappletimpl.h
-        SOURCES=   multikey.cpp multikeyappletimpl.cpp
+        HEADERS=   multikey.h
+        SOURCES=   multikey.cpp
         TARGET  = multikeyapplet
         DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ..
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe
         VERSION         = 1.0.0