8 files changed, 15 insertions, 18 deletions
diff --git a/noncore/todayplugins/fortune/config.in b/noncore/todayplugins/fortune/config.in
index 1f9a08b..ca476f1 100644
--- a/noncore/todayplugins/fortune/config.in
+++ b/noncore/todayplugins/fortune/config.in
@@ -3,2 +3,3 @@
     default "y"
+    depends (LIBQPE || LIBQPE-X11) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && TODAY
     depends TODAY
diff --git a/noncore/todayplugins/fortune/fortune.pro b/noncore/todayplugins/fortune/fortune.pro
index 3446732..84a5730 100644
--- a/noncore/todayplugins/fortune/fortune.pro
+++ b/noncore/todayplugins/fortune/fortune.pro
@@ -15,3 +15,3 @@ DEPENDPATH      += $(OPIEDIR)/include \
 
-LIBS+= -lqpe -lopie
+LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2
 
diff --git a/noncore/todayplugins/fortune/fortuneplugin.cpp b/noncore/todayplugins/fortune/fortuneplugin.cpp
index 9751e6f..69d2c45 100644
--- a/noncore/todayplugins/fortune/fortuneplugin.cpp
+++ b/noncore/todayplugins/fortune/fortuneplugin.cpp
@@ -55,3 +55,3 @@ QString FortunePlugin::pixmapNameConfig() const
 
-TodayConfigWidget* FortunePlugin::configWidget( QWidget* wid )
+TodayConfigWidget* FortunePlugin::configWidget( QWidget* /*wid*/ )
 {
diff --git a/noncore/todayplugins/fortune/fortuneplugin.h b/noncore/todayplugins/fortune/fortuneplugin.h
index 9376771..9b590ad 100644
--- a/noncore/todayplugins/fortune/fortuneplugin.h
+++ b/noncore/todayplugins/fortune/fortuneplugin.h
@@ -19,2 +19,5 @@
 
+#include <opie2/oclickablelabel.h>
+#include <opie2/todayplugininterface.h>
+
 #include <qstring.h>
@@ -22,5 +25,2 @@
 
-#include <opie/oclickablelabel.h>
-#include <opie/todayplugininterface.h>
-
 class FortunePlugin : public TodayPluginObject
diff --git a/noncore/todayplugins/fortune/fortunepluginimpl.h b/noncore/todayplugins/fortune/fortunepluginimpl.h
index 8e380f5..35ecf92 100644
--- a/noncore/todayplugins/fortune/fortunepluginimpl.h
+++ b/noncore/todayplugins/fortune/fortunepluginimpl.h
@@ -19,3 +19,3 @@
 
-#include <opie/todayplugininterface.h>
+#include <opie2/todayplugininterface.h>
 
diff --git a/noncore/todayplugins/fortune/fortunepluginwidget.cpp b/noncore/todayplugins/fortune/fortunepluginwidget.cpp
index e6a0d09..3aa978c 100644
--- a/noncore/todayplugins/fortune/fortunepluginwidget.cpp
+++ b/noncore/todayplugins/fortune/fortunepluginwidget.cpp
@@ -18,2 +18,5 @@
 
+#include <qpe/config.h>
+#include <qpe/qcopenvelope_qws.h>
+
 #include <qvaluelist.h>
@@ -25,8 +28,2 @@
 
-#include <qpe/config.h>
-#include <qpe/qcopenvelope_qws.h>
-
-#include <opie/oprocess.h>
-#include <opie/oticker.h>
-
 FortunePluginWidget::FortunePluginWidget( QWidget *parent,  const char* name )
@@ -78,3 +75,3 @@ void FortunePluginWidget::getFortune() {
 
-void FortunePluginWidget::slotStdOut( OProcess* proc, char* buf, int len )
+void FortunePluginWidget::slotStdOut( OProcess* /*proc*/, char* buf, int len )
 {
diff --git a/noncore/todayplugins/fortune/fortunepluginwidget.h b/noncore/todayplugins/fortune/fortunepluginwidget.h
index 302d046..abb7bed 100644
--- a/noncore/todayplugins/fortune/fortunepluginwidget.h
+++ b/noncore/todayplugins/fortune/fortunepluginwidget.h
@@ -19,2 +19,5 @@
 
+#include <opie2/oprocess.h>
+#include <opie2/oticker.h>
+
 #include <qstring.h>
@@ -22,6 +25,2 @@
 
-#include <opie/oticker.h>
-#include <opie/oprocess.h>
-
-
 class FortunePluginWidget : public QWidget
diff --git a/noncore/todayplugins/fortune/opie-today-fortuneplugin.control b/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
index 48ddab1..9b7adbe 100644
--- a/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
+++ b/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
@@ -6,3 +6,3 @@ Maintainer: Chris Larson <kergoth@handhelds.org>
 Architecture: arm
-Depends: opie-today, fortune (<=9708-0.1) | fortune-mod
+Depends: opie-today, fortune (<=9708-0.1) | fortune-mod, libopiecore2, libopiepim2, libopieui2
 Description: 'fortune' plugin for Today