-rw-r--r-- | microkde/kdecore/klibloader.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp index 1394154..6d0475a 100644 --- a/microkde/kdecore/klibloader.cpp +++ b/microkde/kdecore/klibloader.cpp | |||
@@ -487,35 +487,27 @@ KLibrary* KLibLoader::library( const char *name ) | |||
487 | if ( libfile.isEmpty() ) | 487 | if ( libfile.isEmpty() ) |
488 | return 0; | 488 | return 0; |
489 | #ifdef DESKTOP_VERSION | 489 | #ifdef DESKTOP_VERSION |
490 | QLibrary *qlib = new QLibrary( libfile.latin1() ); | 490 | QLibrary *qlib = new QLibrary( libfile.latin1() ); |
491 | #else | 491 | #else |
492 | QLibrary *qlib = new QLibrary( libfile.latin1(), QLibrary::Immediately ); | 492 | QLibrary *qlib = new QLibrary( libfile.latin1(), QLibrary::Immediately ); |
493 | #endif | 493 | #endif |
494 | 494 | ||
495 | //US lt_dlhandle handle = lt_dlopen( libfile.latin1() ); | 495 | //US lt_dlhandle handle = lt_dlopen( libfile.latin1() ); |
496 | //US if ( !handle ) | 496 | //US if ( !handle ) |
497 | if ( !qlib ) | 497 | if ( !qlib ) |
498 | { | 498 | { |
499 | //US const char* errmsg = lt_dlerror(); | 499 | qDebug( "KLibLoader::library could not load library: %s", libfile.latin1()); |
500 | char* errmsg; | 500 | d->errorMessage = QString::null; |
501 | sprintf(errmsg, "KLibLoader::library could not load library: %s", libfile.latin1()); | 501 | return 0; |
502 | qDebug(errmsg); | ||
503 | |||
504 | if(errmsg) | ||
505 | d->errorMessage = QString::fromLatin1(errmsg); | ||
506 | else | ||
507 | d->errorMessage = QString::null; | ||
508 | kdWarning(150) << "library=" << name << ": file=" << libfile << ": " << d->errorMessage << endl; | ||
509 | return 0; | ||
510 | } | 502 | } |
511 | else | 503 | else |
512 | d->errorMessage = QString::null; | 504 | d->errorMessage = QString::null; |
513 | 505 | ||
514 | KLibrary *lib = new KLibrary( name, libfile, qlib ); | 506 | KLibrary *lib = new KLibrary( name, libfile, qlib ); |
515 | wrap = new KLibWrapPrivate(lib, qlib); | 507 | wrap = new KLibWrapPrivate(lib, qlib); |
516 | d->loaded_stack.prepend(wrap); | 508 | d->loaded_stack.prepend(wrap); |
517 | } | 509 | } |
518 | m_libs.insert( name, wrap ); | 510 | m_libs.insert( name, wrap ); |
519 | 511 | ||
520 | connect( wrap->lib, SIGNAL( destroyed() ), | 512 | connect( wrap->lib, SIGNAL( destroyed() ), |
521 | this, SLOT( slotLibraryDestroyed() ) ); | 513 | this, SLOT( slotLibraryDestroyed() ) ); |