1 files changed, 13 insertions, 5 deletions

diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index b5c03c8..5bc5ad2 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -49,13 +49,13 @@ TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name )
         : QWidget ( parent, name )
 {
         m_applets_changed = false;
 
         QBoxLayout *lay = new QVBoxLayout ( this, 4, 4 );
 
-        QLabel *l = new QLabel ( tr( "Load applets:" ), this );
+        QLabel *l = new QLabel ( tr( "Load applets in Taskbar:" ), this );
         lay-> addWidget ( l );
 
         m_list = new QListView ( this );
         m_list-> addColumn ( "foobar" );
         m_list-> header ( )-> hide ( );
 
@@ -82,43 +82,51 @@ void TaskbarSettings::init ( )
                 QPixmap icon;
                 TaskbarNamedAppletInterface *iface = 0;
 
                 QLibrary *lib = new QLibrary ( path + "/" + *it );
                 lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface );
                 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 ))
                         qApp-> installTranslator ( trans );
                     else
                         delete trans;
                     name = iface-> name ( );
                     icon = iface-> icon ( );
                         iface-> release ( );
-                        lib-> unload ( );
-                } else {
-                        delete lib;
+                }
+                if ( !iface ) {
+                        lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**) &iface );
+                        
+                        if ( iface ) {
                         name = (*it). mid ( 3 );
                         int sep = name. find( ".so" );
                         if ( sep > 0 )
                             name. truncate ( sep );
                         sep = name. find ( "applet" );
                         if ( sep == (int) name.length ( ) - 6 )
                                 name. truncate ( sep );
                         name[0] = name[0]. upper ( );
+                                        iface-> release ( );            
                 }
+                }
+                
+                if ( iface ) {
                 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;
         }
+                lib-> unload ( );
+                delete lib;
+        }
 }
 
 void TaskbarSettings::appletChanged()
 {
         m_applets_changed = true;
 }