4 files changed, 12 insertions, 4 deletions

diff --git a/core/pim/today/plugins/addressbook/addresspluginimpl.cpp b/core/pim/today/plugins/addressbook/addresspluginimpl.cpp
index 54e620e..15cd805 100644
--- a/core/pim/today/plugins/addressbook/addresspluginimpl.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginimpl.cpp
@@ -33,13 +33,15 @@ TodayPluginObject* AddressBookPluginImpl::guiPart() {
 }
 
 QRESULT AddressBookPluginImpl::queryInterface( const QUuid & uuid,  QUnknownInterface **iface ) {
     *iface = 0;
     if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) )  {
         *iface = this, (*iface)->addRef();
-    }
+    }else
+        return QS_FALSE;
+    
     return QS_OK;
 
 }
 
 Q_EXPORT_INTERFACE() {
     Q_CREATE_INSTANCE( AddressBookPluginImpl );
diff --git a/core/pim/today/plugins/datebook/datebookpluginimpl.cpp b/core/pim/today/plugins/datebook/datebookpluginimpl.cpp
index 45736bb..6baffb9 100644
--- a/core/pim/today/plugins/datebook/datebookpluginimpl.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginimpl.cpp
@@ -30,13 +30,15 @@ TodayPluginObject* DatebookPluginImpl::guiPart() {
 }
 
 QRESULT DatebookPluginImpl::queryInterface( const QUuid & uuid,  QUnknownInterface **iface ) {
     *iface = 0;
     if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) )  {
         *iface = this, (*iface)->addRef();
-    }
+    }else
+        return QS_FALSE;
+    
     return QS_OK;
 
 }
 
 Q_EXPORT_INTERFACE() {
     Q_CREATE_INSTANCE( DatebookPluginImpl );
diff --git a/core/pim/today/plugins/mail/mailpluginimpl.cpp b/core/pim/today/plugins/mail/mailpluginimpl.cpp
index bd57bc9..dfd3a64 100644
--- a/core/pim/today/plugins/mail/mailpluginimpl.cpp
+++ b/core/pim/today/plugins/mail/mailpluginimpl.cpp
@@ -33,13 +33,15 @@ TodayPluginObject* MailPluginImpl::guiPart() {
 }
 
 QRESULT MailPluginImpl::queryInterface( const QUuid & uuid,  QUnknownInterface **iface ) {
     *iface = 0;
     if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) )  {
         *iface = this, (*iface)->addRef();
-    }
+    }else
+        return QS_FALSE;
+    
     return QS_OK;
 
 }
 
 Q_EXPORT_INTERFACE() {
     Q_CREATE_INSTANCE( MailPluginImpl );
diff --git a/core/pim/today/plugins/todolist/todopluginimpl.cpp b/core/pim/today/plugins/todolist/todopluginimpl.cpp
index c64113c..639587f 100644
--- a/core/pim/today/plugins/todolist/todopluginimpl.cpp
+++ b/core/pim/today/plugins/todolist/todopluginimpl.cpp
@@ -31,13 +31,15 @@ TodayPluginObject* TodolistPluginImpl::guiPart() {
 }
 
 QRESULT TodolistPluginImpl::queryInterface( const QUuid & uuid,  QUnknownInterface **iface ) {
     *iface = 0;
     if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) )  {
         *iface = this, (*iface)->addRef();
-    }
+    }else
+        return QS_FALSE;
+        
     return QS_OK;
 
 }
 
 Q_EXPORT_INTERFACE() {
     Q_CREATE_INSTANCE( TodolistPluginImpl );