2 files changed, 21 insertions, 0 deletions

diff --git a/core/settings/launcher/menusettings.cpp b/core/settings/launcher/menusettings.cpp
index 5a9fada..6fca621 100644
--- a/core/settings/launcher/menusettings.cpp
+++ b/core/settings/launcher/menusettings.cpp
@@ -58,49 +58,53 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name )
         m_list = new QListView ( this );
         m_list-> addColumn ( "foobar" );
         m_list-> header ( )-> hide ( );
 
         lay-> addWidget ( m_list );
         
         m_menutabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this );
         lay-> addWidget ( m_menutabs );
 
         QWhatsThis::add ( m_list, tr( "Check the applets that you want to have included in the O-Menu." ));
         QWhatsThis::add ( m_menutabs, tr( "Adds the contents of the Launcher Tabs as menus in the O-Menu." ));
 
         connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( )));
 
         init ( );
 }
 
 void MenuSettings::init ( )
 {
         Config cfg ( "StartMenu" );
         cfg. setGroup ( "Applets" );
         QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' );
 
         QString path = QPEApplication::qpeDir ( ) + "/plugins/applets";
+#ifdef Q_OS_MACX
+        QStringList list = QDir ( path, "lib*.dylib" ). entryList ( );
+#else
         QStringList list = QDir ( path, "lib*.so" ). entryList ( );
+#endif /* Q_OS_MACX */
 
         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 );
         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 ( ). pixmap ( QIconSet::Small, QIconSet::Normal );
                         iface-> release ( );
                         lib-> unload ( );
 
                         QCheckListItem *item;
                         item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox );
diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index b3e302a..d03ea49 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -54,87 +54,104 @@ TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name )
 
         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 ( );
 
         lay-> addWidget ( m_list );
 
         QWhatsThis::add ( m_list, tr( "Check the applets that you want displayed in the Taskbar." ));
 
         connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( )));
 
         init ( );
 }
 
 void TaskbarSettings::init ( )
 {
         Config cfg ( "Taskbar" );
         cfg. setGroup ( "Applets" );
         QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' );
 
         QString path = QPEApplication::qpeDir ( ) + "/plugins/applets";
+#ifdef Q_OS_MACX
+        QStringList list = QDir ( path, "lib*.dylib" ). entryList ( );
+#else
         QStringList list = QDir ( path, "lib*.so" ). entryList ( );
+#endif /* Q_OS_MACX */
 
         for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) {
                 QString name;
                 QPixmap icon;
                 TaskbarNamedAppletInterface *iface = 0;
 
+                qWarning("Load applet: %s", (*it).latin1() );
                 QLibrary *lib = new QLibrary ( path + "/" + *it );
                 lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface );
+                qWarning("<1>");
                 if ( iface ) {
+                        qWarning("<2>");
                         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 ( );
                 }
+                qWarning("<3>");
                 if ( !iface ) {
+                        qWarning("<4>");
                         lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**) &iface );
                         
                         if ( iface ) {
+                                qWarning("<5>");
                                 name = (*it). mid ( 3 );
+                                qWarning("Found applet: %s", name.latin1() );
+#ifdef Q_OS_MACX
+                                int sep = name. find( ".dylib" );
+#else
                                 int sep = name. find( ".so" );
+#endif /* Q_OS_MACX */
                                 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 ( );            
                                 }                               
                 }
+                qWarning("<6>");
                 
                 if ( iface ) {
+                        qWarning("<7>");
                         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;
 }
 
 void TaskbarSettings::accept ( )
 {
         Config cfg ( "Taskbar" );
         cfg. setGroup ( "Applets" );
 
         if ( m_applets_changed ) {
                 QStringList exclude;