2 files changed, 12 insertions, 6 deletions

diff --git a/core/settings/launcher/menusettings.cpp b/core/settings/launcher/menusettings.cpp
index 29ce841..d63b203 100644
--- a/core/settings/launcher/menusettings.cpp
+++ b/core/settings/launcher/menusettings.cpp
@@ -30,12 +30,13 @@ _;:,   .>  :=|.         This file is free software; you can
 
 #include <qpe/config.h>
 #include <qpe/qlibrary.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/menuappletinterface.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <opie2/odebug.h>
 
 #include <qdir.h>
 #include <qlistview.h>
 #include <qcheckbox.h>
 #include <qheader.h>
 #include <qlayout.h>
@@ -91,13 +92,15 @@ void MenuSettings::init ( )
         for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) {
                 QString name;
                 QPixmap icon;
                 MenuAppletInterface *iface = 0;
 
                 QLibrary *lib = new QLibrary ( path + "/" + *it );
-                lib-> queryInterface ( IID_MenuApplet, (QUnknownInterface**) &iface );
+                QRESULT retVal = QS_OK;
+                if ((retVal = lib-> queryInterface ( IID_MenuApplet, (QUnknownInterface**)(&iface) )) != QS_OK )
+                        owarn << "queryInterface failed with " << retVal << oendl;
         if ( iface ) {
                         QString lang = getenv( "LANG" );
                         QTranslator *trans = new QTranslator ( qApp );
                         QString type = (*it). left ((*it). find ("."));
                         QString tfn = QPEApplication::qpeDir ( ) + "i18n/" + lang + "/" + type + ".qm";
                         if ( trans-> load ( tfn ))
diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index 861ff3a..c2b82b9 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -88,13 +88,15 @@ void TaskbarSettings::init ( )
         QString name;
         QPixmap icon;
         TaskbarNamedAppletInterface *iface = 0;
 
         owarn << "Load applet: " << (*it) << "" << oendl;
         QLibrary *lib = new QLibrary ( path + "/" + *it );
-        lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface );
+        QRESULT retVal = QS_OK;
+        if ((retVal = lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**)(&iface) )) != QS_OK)
+            owarn << "<0>" << oendl;
         owarn << "<1>" << oendl;
         if ( iface ) {
             owarn << "<2>" << oendl;
             QString lang = getenv( "LANG" );
             QTranslator *trans = new QTranslator ( qApp );
             QString type = (*it). left ((*it). find ("."));
@@ -107,16 +109,17 @@ void TaskbarSettings::init ( )
             icon = iface-> icon ( );
             iface-> release ( );
         }
         owarn << "<3>" << oendl;
         if ( !iface ) {
             owarn << "<4>" << oendl;
-            lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**) &iface );
+            if ((retVal = lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**)(&iface))) != QS_OK)
+                owarn << "<5>" << oendl;
 
             if ( iface ) {
-                owarn << "<5>" << oendl;
+                owarn << "<6>" << oendl;
                 name = (*it). mid ( 3 );
                 owarn << "Found applet: " << name << "" << oendl;
 #ifdef Q_OS_MACX
                 int sep = name. find( ".dylib" );
 #else
                 int sep = name. find( ".so" );
@@ -127,16 +130,16 @@ void TaskbarSettings::init ( )
                 if ( sep == (int) name.length ( ) - 6 )
                     name. truncate ( sep );
                 name[0] = name[0]. upper ( );
                 iface-> release ( );
             }
         }
-        owarn << "<6>" << oendl;
+        owarn << "<7>" << oendl;
 
         if ( iface ) {
-            owarn << "<7>" << oendl;
+            owarn << "<8>" << oendl;
             QCheckListItem *item;
             item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox );
             if ( !icon. isNull ( ))
                 item-> setPixmap ( 0, icon );
             item-> setOn ( exclude. find ( *it ) == exclude. end ( ));
             m_applets [*it] = item;