5 files changed, 11 insertions, 4 deletions

diff --git a/core/pim/today/plugins/addressbook/addressbook.pro b/core/pim/today/plugins/addressbook/addressbook.pro
index 4ebbc9e..54aaff2 100644
--- a/core/pim/today/plugins/addressbook/addressbook.pro
+++ b/core/pim/today/plugins/addressbook/addressbook.pro
@@ -1,43 +1,43 @@
 TEMPLATE = lib
 CONFIG -= moc
-CONFIG += qt release
+CONFIG += qt plugin release
 
 # Input
 HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h  \
         addresspluginwidget.h
 SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \
         addresspluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
                 ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                 ../ ../library
 
 LIBS+= -lqpe -lopie
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayaddressbookplugin
 
 TRANSLATIONS = ../../../../../i18n/de/libtodayaddressbookplugin.ts \
          ../../../../../i18n/nl/libtodayaddressbookplugin.ts \
          ../../../../../i18n/xx/libtodayaddressbookplugin.ts \
          ../../../../../i18n/en/libtodayaddressbookplugin.ts \
          ../../../../../i18n/es/libtodayaddressbookplugin.ts \
          ../../../../../i18n/fr/libtodayaddressbookplugin.ts \
          ../../../../../i18n/hu/libtodayaddressbookplugin.ts \
          ../../../../../i18n/ja/libtodayaddressbookplugin.ts \
          ../../../../../i18n/ko/libtodayaddressbookplugin.ts \
          ../../../../../i18n/no/libtodayaddressbookplugin.ts \
          ../../../../../i18n/pl/libtodayaddressbookplugin.ts \
          ../../../../../i18n/pt/libtodayaddressbookplugin.ts \
          ../../../../../i18n/pt_BR/libtodayaddressbookplugin.ts \
          ../../../../../i18n/sl/libtodayaddressbookplugin.ts \
          ../../../../../i18n/zh_CN/libtodayaddressbookplugin.ts \
          ../../../../../i18n/zh_TW/libtodayaddressbookplugin.ts \
          ../../../../../i18n/it/libtodayaddressbookplugin.ts \
          ../../../../../i18n/da/libtodayaddressbookplugin.ts
 
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro
index e0a1dcb..2139f63 100644
--- a/core/pim/today/plugins/datebook/datebook.pro
+++ b/core/pim/today/plugins/datebook/datebook.pro
@@ -1,39 +1,39 @@
 TEMPLATE = lib
 CONFIG -= moc
-CONFIG += qt release
+CONFIG += qt plugin release
 # Input
 HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \
         datebookevent.h datebookpluginwidget.h
 SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \
         datebookevent.cpp datebookpluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
                 ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                 ../ ../library
 
 LIBS+= -lqpe -lopie 
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaydatebookplugin
 
 TRANSLATIONS = ../../../../../i18n/de/libtodaydatebookplugin.ts \
          ../../../../../i18n/nl/libtodaydatebookplugin.ts \
          ../../../../../i18n/xx/libtodaydatebookplugin.ts \
          ../../../../../i18n/en/libtodaydatebookplugin.ts \
          ../../../../../i18n/es/libtodaydatebookplugin.ts \
          ../../../../../i18n/fr/libtodaydatebookplugin.ts \
          ../../../../../i18n/hu/libtodaydatebookplugin.ts \
          ../../../../../i18n/ja/libtodaydatebookplugin.ts \
          ../../../../../i18n/ko/libtodaydatebookplugin.ts \
          ../../../../../i18n/no/libtodaydatebookplugin.ts \
          ../../../../../i18n/pl/libtodaydatebookplugin.ts \
          ../../../../../i18n/pt/libtodaydatebookplugin.ts \
          ../../../../../i18n/pt_BR/libtodaydatebookplugin.ts \
          ../../../../../i18n/sl/libtodaydatebookplugin.ts \
          ../../../../../i18n/zh_CN/libtodaydatebookplugin.ts \
          ../../../../../i18n/zh_TW/libtodaydatebookplugin.ts \
          ../../../../../i18n/it/libtodaydatebookplugin.ts \
          ../../../../../i18n/da/libtodaydatebookplugin.ts
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/mail/mail.pro b/core/pim/today/plugins/mail/mail.pro
index 70c484d..421b3a5 100644
--- a/core/pim/today/plugins/mail/mail.pro
+++ b/core/pim/today/plugins/mail/mail.pro
@@ -1,37 +1,37 @@
 TEMPLATE = lib
 CONFIG -= moc
-CONFIG += qt release
+CONFIG += qt plugin release
 
 # Input
 HEADERS = mailplugin.h mailpluginimpl.h mailpluginwidget.h
 SOURCES = mailplugin.cpp mailpluginimpl.cpp mailpluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
                 ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                 ../ ../library
 
 LIBS+= -lqpe -lopie
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaymailplugin
 
 TRANSLATIONS = ../../../../../i18n/de/libtodaymailplugin.ts \
          ../../../../../i18n/nl/libtodaymailplugin.ts \
          ../../../../../i18n/xx/libtodaymailplugin.ts \
          ../../../../../i18n/en/libtodaymailplugin.ts \
          ../../../../../i18n/es/libtodaymailplugin.ts \
          ../../../../../i18n/fr/libtodaymailplugin.ts \
          ../../../../../i18n/hu/libtodaymailplugin.ts \
          ../../../../../i18n/ja/libtodaymailplugin.ts \
          ../../../../../i18n/ko/libtodaymailplugin.ts \
          ../../../../../i18n/no/libtodaymailplugin.ts \
          ../../../../../i18n/pl/libtodaymailplugin.ts \
          ../../../../../i18n/pt/libtodaymailplugin.ts \
          ../../../../../i18n/pt_BR/libtodaymailplugin.ts \
          ../../../../../i18n/sl/libtodaymailplugin.ts \
          ../../../../../i18n/zh_CN/libtodaymailplugin.ts \
          ../../../../../i18n/zh_TW/libtodaymailplugin.ts \
          ../../../../../i18n/it/libtodaymailplugin.ts \
          ../../../../../i18n/da/libtodaymailplugin.ts
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro
index 31a6a27..c8730bb 100644
--- a/core/pim/today/plugins/todolist/todolist.pro
+++ b/core/pim/today/plugins/todolist/todolist.pro
@@ -1,40 +1,40 @@
 TEMPLATE = lib
 CONFIG -= moc
-CONFIG += qt release
+CONFIG += qt plugin release
 
 # Input
 HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.h  \
         todopluginwidget.h
 SOURCES = todoplugin.cpp todopluginimpl.cpp todopluginconfig.cpp \
         todopluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
                 ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                 ../ ../library
 
 LIBS+= -lqpe -lopie
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaytodolistplugin
 
 TRANSLATIONS = ../../../../../i18n/de/libtodaytodolistplugin.ts \
          ../../../../../i18n/nl/libtodaytodolistplugin.ts \
          ../../../../../i18n/xx/libtodaytodolistplugin.ts \
          ../../../../../i18n/en/libtodaytodolistplugin.ts \
          ../../../../../i18n/es/libtodaytodolistplugin.ts \
          ../../../../../i18n/fr/libtodaytodolistplugin.ts \
          ../../../../../i18n/hu/libtodaytodolistplugin.ts \
          ../../../../../i18n/ja/libtodaytodolistplugin.ts \
          ../../../../../i18n/ko/libtodaytodolistplugin.ts \
          ../../../../../i18n/no/libtodaytodolistplugin.ts \
          ../../../../../i18n/pl/libtodaytodolistplugin.ts \
          ../../../../../i18n/pt/libtodaytodolistplugin.ts \
          ../../../../../i18n/pt_BR/libtodaytodolistplugin.ts \
          ../../../../../i18n/sl/libtodaytodolistplugin.ts \
          ../../../../../i18n/zh_CN/libtodaytodolistplugin.ts \
          ../../../../../i18n/zh_TW/libtodaytodolistplugin.ts \
          ../../../../../i18n/it/libtodaytodolistplugin.ts \
          ../../../../../i18n/da/libtodaytodolistplugin.ts
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index f213943..cb18c1c 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -129,101 +129,108 @@ void Today::init() {
     m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
     m_allApplets = cfg.readListEntry( "AllApplets", ',' );
 
     cfg.setGroup( "General" );
     m_iconSize = cfg.readNumEntry( "IconSize", 18 );
     m_hideBanner = cfg.readNumEntry( "HideBanner", 0 );
     setRefreshTimer(  cfg.readNumEntry( "checkinterval", 15000 ) );
 
     // set the date in top label
     QDate date = QDate::currentDate();
     DateLabel->setText( QString( "<font color=#FFFFFF>" + TimeString::longDateString( date ) + "</font>" ) );
 
     if ( layout ) {
       delete layout;
     }
 
     if ( m_hideBanner )  {
         Opiezilla->hide();
         TodayLabel->hide();
     } else {
         Opiezilla->show();
         TodayLabel->show();
     }
 
     layout = new QVBoxLayout( this );
     layout->addWidget( Frame );
     layout->addWidget( OwnerField );
 }
 
 /**
  * Load the plugins
  */
 void Today::loadPlugins() {
 
     init();
     QValueList<TodayPlugin>::Iterator tit;
     if ( !pluginList.isEmpty() ) {
         for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) {
             (*tit).guiBox->hide();
             (*tit).guiBox->reparent( 0, QPoint( 0, 0 ) );
             delete (*tit).guiBox;
             (*tit).library->unload();
             delete (*tit).library;
         }
         pluginList.clear();
     }
 
     QString path = QPEApplication::qpeDir() + "/plugins/today";
+    qWarning("Searching for Plugins in: %s", path.latin1());
+#ifdef Q_OS_MACX
+    QDir dir( path, "lib*.dylib" );
+#else
     QDir dir( path, "lib*.so" );
+#endif
 
     QStringList list = dir.entryList();
     QStringList::Iterator it;
 
+    qWarning("Found: %d entries !", list.count() );
+
     QMap<QString, TodayPlugin> tempList;
 
     for ( it = list.begin(); it != list.end(); ++it ) {
         QInterfacePtr<TodayPluginInterface> iface;
         QLibrary *lib = new QLibrary( path + "/" + *it );
 
         qDebug( "querying: %s", QString( path + "/" + *it ).latin1() );
         if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) {
             qDebug( "accepted: %s", QString( path + "/" + *it ).latin1() );
             qDebug( QString(*it) );
 
             TodayPlugin plugin;
             plugin.library = lib;
             plugin.iface = iface;
             plugin.name = QString(*it);
 
             QString type = (*it).left( (*it).find(".") );
 
             // grr, sharp rom does not know Global::languageList();
             //            QStringList langs = Global::languageList();
             QString tfn = QPEApplication::qpeDir() + "/i18n/";
             QDir langDir = tfn;
             QStringList langs = langDir.entryList("*", QDir::Dirs );
 
             for (QStringList::ConstIterator lit = langs.begin(); lit!=langs.end(); ++lit) {
                 QString lang = *lit;
                 qDebug( "Languages: " + lang );
                 QTranslator * trans = new QTranslator( qApp );
                 QString tfn = QPEApplication::qpeDir()+"/i18n/" + lang + "/" + type + ".qm";
                 if ( trans->load( tfn ) )  {
                     qApp->installTranslator( trans );
                 }  else {
                     delete trans;
                 }
             }
 
             // find out if plugins should be shown
             if ( m_excludeApplets.grep( *it ).isEmpty() ) {
                 plugin.active = true;
             } else {
                 plugin.active = false;
             }
 
             plugin.guiPart = plugin.iface->guiPart();
             plugin.excludeRefresh = plugin.guiPart->excludeFromRefresh();
 
             // package the whole thing into a qwidget so it can be shown and hidden
             plugin.guiBox = new QWidget( this );