4 files changed, 16 insertions, 11 deletions
diff --git a/noncore/apps/opie-gutenbrowser/browserDialog.cpp b/noncore/apps/opie-gutenbrowser/browserDialog.cpp
index 5c48da1..81dd516 100644
--- a/noncore/apps/opie-gutenbrowser/browserDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/browserDialog.cpp
@@ -8,13 +8,16 @@ copyright 2001 by L.J. Potter ljp@llornkcor.com
 #include "optionsDialog.h"
 //#include "fileBrowser.h"
 
+/* OPIE */
+#include <opie2/ofiledialog.h>
+using namespace Opie::Ui;
+
+/* QT */
 #include <qlabel.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 
-#include <opie/ofiledialog.h>
-
 void optionsDialog::BrowserDlg( )
 {
 //    setCaption( tr( "Choose Browser" ) );
diff --git a/noncore/apps/opie-gutenbrowser/config.in b/noncore/apps/opie-gutenbrowser/config.in
index ec67d6e..d2a3033 100644
--- a/noncore/apps/opie-gutenbrowser/config.in
+++ b/noncore/apps/opie-gutenbrowser/config.in
@@ -1,4 +1,6 @@
-  config OPIE-GUTENBROWSER
+  config GUTENBROWSER
     boolean "gutenbrowser - Gutenberg Project etext reader and selector"
     default "n"
-    depends ( LIBQPE || LIBQPE-X11 ) && FTPLIB
+    depends ( LIBQPE || LIBQPE-X11 ) && FTPLIB && LIBOPIE2CORE && LIBOPIE2UI
+    comment "gutenbrowser needs a libqpe, ftplib, libopie2core and libopie2ui"
+    depends !(( LIBQPE || LIBQPE-X11 ) && FTPLIB && LIBOPIE2CORE && LIBOPIE2UI)
diff --git a/noncore/apps/opie-gutenbrowser/openetext.cpp b/noncore/apps/opie-gutenbrowser/openetext.cpp
index 40f35d6..bd44ce6 100644
--- a/noncore/apps/opie-gutenbrowser/openetext.cpp
+++ b/noncore/apps/opie-gutenbrowser/openetext.cpp
@@ -16,15 +16,16 @@
 #include "openetext.h"
 #include "editTitle.h"
 
-#include <qfileinfo.h>
+/* OPIE */
+#include <opie2/ofiledialog.h>
 #include <qpe/applnk.h>
+#include <qpe/config.h>
 #include <qpe/qpeapplication.h>
+using namespace Opie::Ui;
 
 #include <stdlib.h>
 #include <qtextstream.h>
-#include <qpe/config.h>
-
-#include <opie/ofiledialog.h>
+#include <qfileinfo.h>
 
 #if defined(_WS_WIN_)
 #include <windows.h>
diff --git a/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro b/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro
index e34e922..5c1d0c4 100644
--- a/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro
+++ b/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro
@@ -1,6 +1,5 @@
 TEMPLATE  = app
-CONFIG    += qt warn_on release quick-app
-#CONFIG    += qt warn_on release qpp
+CONFIG    += qt warn_on quick-app
 HEADERS   = LibraryDialog.h \
           SearchDialog.h \
           SearchResults.h \
@@ -40,6 +39,6 @@ TARGET    = gutenbrowser
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 DESTDIR = $(OPIEDIR)/bin
-LIBS   += -lqpe -lpthread -lftplib -lopie
+LIBS   += -lqpe -lpthread -lftplib -lopiecore2 -lopieui2
 
 include ( $(OPIEDIR)/include.pro )