2 files changed, 22 insertions, 24 deletions

diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index f9fc70b..8faaaef 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -23,28 +23,16 @@ Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
-#ifndef DESKTOP_VERSION
-#include <qpe/global.h>
-#else
-
-#include <qdir.h>
-#endif
-#ifdef KAB_EMBEDDED
 
+/*US
 #include <stdlib.h>
-#else //KAB_EMBEDDED
 
-#include <stdlib.h>
-
-//US#include <kresources/manager.h>
 #include <kapplication.h>
 #include <kcrash.h>
 #include <ksimpleconfig.h>
-
-
-#endif //KAB_EMBEDDED
+*/
 
 #include "resource.h"
 #include <kresources/manager.h>
 #include <kdebug.h>
@@ -67,9 +55,8 @@ QString StdAddressBook::fileName()
 }
 
 QString StdAddressBook::directoryName()
 {
-  qDebug("StdAddressBook::directoryName() WILL FAIL OR NOT" );
   return locateLocal( "data", "kabc/stdvcf" );
 }
 
 void StdAddressBook::handleCrash()
@@ -210,13 +197,10 @@ bool StdAddressBook::save()
 
 void StdAddressBook::close()
 {
 //US destructObject is not defined on my system???. Is setObject(0) the same ???
-#ifndef KAB_EMBEDDED
-  addressBookDeleter.destructObject();
-#else //KAB_EMBEDDED
+//US  addressBookDeleter.destructObject();
   addressBookDeleter.setObject(0);
-#endif //KAB_EMBEDDED
   
 }
 
 void StdAddressBook::setAutomaticSave( bool enable )
diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp
index 1410308..130cc7c 100644
--- a/microkde/kdecore/klibloader.cpp
+++ b/microkde/kdecore/klibloader.cpp
@@ -156,9 +156,10 @@ KLibFactory* KLibrary::factory()
 
     void* sym = symbol( symname );
         if ( !sym )
         {
-            kdWarning(150) << "KLibrary: The library " << name() << " does not offer an init_" << name() << " function" << endl;
+            qDebug("KLibrary: The library %s does not offer an %s function", name().latin1(), symname.data());
+            kdWarning(150) << "KLibrary: The library " << name().latin1() << " does not offer an init_" << name().latin1() << " function" << endl;
             return 0;
     }
 
     typedef KLibFactory* (*t_func)();
@@ -367,18 +368,31 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta
     // (mhk, 20000228)
     int pos = libname.findRev('/');
     if (pos < 0)
       pos = 0;
-    if (libname.find('.', pos) < 0)
+/*US      
+    if (libname.find('.', pos) < 0) {
       libname += ".la";
+    }
+*/    
+//US in the microedition we work only with shared libraries.
+    if (libname.find('.', pos) < 0) {
+      libname += ".so";
+    }
 
     // only look up the file if it is not an absolute filename
     // (mhk, 20000228)
     QString libfile;
     if (libname[0] == '/')
       libfile = libname;
     else
     {
+//US at this point the libname must exist as real filesname. No expansions will be made later
+// in findResources. Because of that we prepend the lib prefix here to the name 
+//US I add also the "lib" prefix. I do not how could this could have worked before without it?
+    libname.insert(pos, "lib");
+    
+    
 //US      libfile = instance->dirs()->findResource( "module", libname );
       libfile = KGlobal::dirs()->findResource( "module", libname );
       if ( libfile.isEmpty() )
       {
@@ -394,8 +408,11 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta
 #ifndef NDEBUG
         kdDebug(150) << "library=" << libname << ": No file names " << libname.data() << " found in paths." << endl;
 #endif
             self()->d->errorMessage = i18n("Library files for \"%1\" not found in paths").arg(libname); 
+            
+        qDebug("KLibLoader::library could not find library: %s", libname.data());
+            
       }
       else
             self()->d->errorMessage = QString::null;
     }
@@ -453,11 +470,8 @@ KLibrary* KLibLoader::library( const char *name )
       QString libfile = findLibrary( name );
       if ( libfile.isEmpty() )
         return 0;
 
-      const QString & qpeDir = QPEApplication::qpeDir();
-      libfile = qpeDir + libfile;
-//US      QLibrary *lib = new QLibrary( qpeDir + "/plugins/korganizer/libopiekabc.so", QLibrary::Immediately );
       QLibrary *qlib = new QLibrary( libfile.latin1(), QLibrary::Immediately );
         
 //US      lt_dlhandle handle = lt_dlopen( libfile.latin1() );
 //US      if ( !handle )