5 files changed, 17 insertions, 18 deletions

diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp
index c07d50f..c091e05 100644
--- a/microkde/kdecore/klibloader.cpp
+++ b/microkde/kdecore/klibloader.cpp
@@ -42,10 +42,7 @@
 #include <qtopia/qlibrary.h>
+#else
+#include <qlibrary.h> 
 #endif
 
-/*US
-#ifdef Q_WS_X11
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#endif
-*/
+
 template class QAsciiDict<KLibrary>;
@@ -194,3 +191,2 @@ void* KLibrary::symbol( const char* symname ) const
 //US        kdWarning(150) << "KLibrary: " << lt_dlerror() << endl;
-        kdWarning(150) << "KLibrary: " << m_libname << ", symbol:" << symname << " not found " << endl;
         return 0;
@@ -479,4 +475,7 @@ KLibrary* KLibLoader::library( const char *name )
         return 0;
-
+#ifdef DESKTOP_VERSION
+      QLibrary *qlib = new QLibrary( libfile.latin1() );
+#else
       QLibrary *qlib = new QLibrary( libfile.latin1(), QLibrary::Immediately );
+#endif
         
@@ -601,2 +600,3 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
 
+#if 0
 #ifndef Q_WS_QWS
@@ -630,2 +630,3 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
 
+#endif // 0
     deleted_one = true;
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index 1a1e027..7f51d78 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -45,3 +45,2 @@
 #include <qstringlist.h>
-#include <qpe/qpeapplication.h>
 
@@ -1227,3 +1226,3 @@ void KStandardDirs::addKDEDefaults()
 //US for embedded, add qtopia dir as kdedir    
-   kdedirList.append(QPEApplication::qpeDir());
+    kdedirList.append(readEnvPath("QPEDIR" ));
 
diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp
index 92cb8d2..79b0f9d 100644
--- a/microkde/kdeui/ktoolbar.cpp
+++ b/microkde/kdeui/ktoolbar.cpp
@@ -1026,3 +1026,3 @@ int KToolBar::iconSize() const
     int ret = 18;
-    if ( QApplication::desktop()->width() > 320 && QApplication::desktop()->width() < 650  )
+    if ( QApplication::desktop()->width() > 320   )
         ret = 30;
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp
index 827ec38..2253de4 100644
--- a/microkde/kresources/factory.cpp
+++ b/microkde/kresources/factory.cpp
@@ -28,4 +28,5 @@
 #include <kstaticdeleter.h>
+//#ifndef DESKTOP_VERSION
 #include <klibloader.h>
-
+//#endif
 #include <qfile.h>
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 1e9b022..05833a9 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -100,3 +100,4 @@ KDGanttMinimizeSplitter.h \
  kdeui/kactionclasses.h \
- kdeui/kactioncollection.h 
+ kdeui/kactioncollection.h \
+ kdecore/klibloader.h 
  
@@ -165,6 +166,3 @@ KDGanttMinimizeSplitter.cpp \
  kdeui/kstdaction.cpp \
- kdeui/kxmlguiclient.cpp 
-
-
-
-# kdecore/klibloader.cpp \
\ No newline at end of file
+ kdeui/kxmlguiclient.cpp \
+ kdecore/klibloader.cpp 
\ No newline at end of file