2 files changed, 7 insertions, 6 deletions

diff --git a/core/pim/today/plugins/datebook/datebookpluginimpl.cpp b/core/pim/today/plugins/datebook/datebookpluginimpl.cpp
index 4159b49..45736bb 100644
--- a/core/pim/today/plugins/datebook/datebookpluginimpl.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginimpl.cpp
@@ -19,12 +19,13 @@
 
 DatebookPluginImpl::DatebookPluginImpl() {
     datebookPlugin  = new DatebookPlugin();
 }
 
 DatebookPluginImpl::~DatebookPluginImpl() {
+    delete datebookPlugin;
 }
 
 TodayPluginObject* DatebookPluginImpl::guiPart() {
     return datebookPlugin;
 }
 
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 01ef02d..1b31cfd 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -36,14 +36,15 @@
 #include <opie/otabwidget.h>
 #include <qdialog.h>
 #include <qwhatsthis.h>
 
 
 struct TodayPlugin {
+    TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {}
     QLibrary *library;
-    TodayPluginInterface *iface;
+    QInterfacePtr<TodayPluginInterface> iface;
     TodayPluginObject *guiPart;
     QWidget *guiBox;
     QString name;
     bool active;
     bool excludeRefresh;
     int pos;
@@ -158,34 +159,33 @@ void Today::loadPlugins() {
                 delete (*tit).library;
             }
         }
         pluginList.clear();
     }
 
-
     QString path = QPEApplication::qpeDir() + "/plugins/today";
     QDir dir( path, "lib*.so" );
 
     QStringList list = dir.entryList();
     QStringList::Iterator it;
 
     QMap<QString, TodayPlugin> tempList;
 
     for ( it = list.begin(); it != list.end(); ++it ) {
-	TodayPluginInterface *iface = 0;
-	QLibrary *lib = new QLibrary( path + "/" + *it );
+//	TodayPluginInterface *iface = 0;
+        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( "loading: %s", QString( path + "/" + *it ).latin1() );
             qDebug( QString(*it) );
 
             // If plugin is exludes from refresh, get it in the list again here.
 
             if ( pluginListRefreshExclude.contains( (*it) ) ) {
-
                 // if its not in allApplets list, add it to a layout
                 if ( !m_allApplets.contains( pluginListRefreshExclude[(*it)].name ) ) {
                     qDebug( "NUGASDA" );
                     layout->addWidget( pluginListRefreshExclude[(*it)].guiBox );
                     pluginList.append( pluginListRefreshExclude[(*it)] );
                 } else {
@@ -240,13 +240,13 @@ void Today::loadPlugins() {
                 if ( m_allApplets.isEmpty() ) {
                     layout->addWidget( plugin.guiBox );
                     pluginList.append( plugin );
                 }
 
                 // if plugin is not yet in the list, add it to the layout too
-                if ( !m_allApplets.contains( plugin.name ) ) {
+                else if ( !m_allApplets.contains( plugin.name ) ) {
                     layout->addWidget( plugin.guiBox );
                     pluginList.append( plugin );
                 }
             }
         } else {
             qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() );