17 files changed, 37 insertions, 3 deletions

diff --git a/core/applets/batteryapplet/batteryappletimpl.cpp b/core/applets/batteryapplet/batteryappletimpl.cpp
index 3f3079a..9ad0382 100644
--- a/core/applets/batteryapplet/batteryappletimpl.cpp
+++ b/core/applets/batteryapplet/batteryappletimpl.cpp
@@ -50,6 +50,8 @@ QRESULT BatteryAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface
         *iface = this;
     else if ( uuid == IID_TaskbarApplet )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
diff --git a/core/applets/cardmon/cardmonimpl.cpp b/core/applets/cardmon/cardmonimpl.cpp
index 0aa55de..265214e 100644
--- a/core/applets/cardmon/cardmonimpl.cpp
+++ b/core/applets/cardmon/cardmonimpl.cpp
@@ -27,6 +27,8 @@ QRESULT CardMonitorImpl::queryInterface( const QUuid &uuid, QUnknownInterface **
         *iface = this;
     } else if ( uuid == IID_TaskbarApplet ) {
         *iface = this;
+    } else {
+        return QS_FALSE;
     }
 
     if ( *iface ) {
diff --git a/core/applets/clipboardapplet/clipboardappletimpl.cpp b/core/applets/clipboardapplet/clipboardappletimpl.cpp
index 8080690..8fcf117 100644
--- a/core/applets/clipboardapplet/clipboardappletimpl.cpp
+++ b/core/applets/clipboardapplet/clipboardappletimpl.cpp
@@ -50,6 +50,8 @@ QRESULT ClipboardAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterfac
         *iface = this;
     else if ( uuid == IID_TaskbarApplet )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
diff --git a/core/applets/clockapplet/clockappletimpl.cpp b/core/applets/clockapplet/clockappletimpl.cpp
index 8bf1baf..2b9cc05 100644
--- a/core/applets/clockapplet/clockappletimpl.cpp
+++ b/core/applets/clockapplet/clockappletimpl.cpp
@@ -51,6 +51,8 @@ QRESULT ClockAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **
         *iface = this;
     else if ( uuid == IID_TaskbarApplet )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
diff --git a/core/applets/homeapplet/home.cpp b/core/applets/homeapplet/home.cpp
index 017de27..36307ab 100644
--- a/core/applets/homeapplet/home.cpp
+++ b/core/applets/homeapplet/home.cpp
@@ -71,6 +71,8 @@ QRESULT HomeApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **ifac
                 *iface = this;
         else if ( uuid == IID_MenuApplet )
                 *iface = this;
+        else
+            return QS_FALSE;
 
         if ( *iface )
                 (*iface)-> addRef ( );
diff --git a/core/applets/irdaapplet/irdaappletimpl.cpp b/core/applets/irdaapplet/irdaappletimpl.cpp
index 02443db..3617698 100644
--- a/core/applets/irdaapplet/irdaappletimpl.cpp
+++ b/core/applets/irdaapplet/irdaappletimpl.cpp
@@ -50,7 +50,9 @@ QRESULT IrdaAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **i
   *iface = this;
     else if ( uuid == IID_TaskbarApplet )
   *iface = this;
-
+    else
+        return QS_FALSE;
+        
     if ( *iface )
   (*iface)->addRef();
     return QS_OK;
diff --git a/core/applets/logoutapplet/logout.cpp b/core/applets/logoutapplet/logout.cpp
index 1769ae6..8d3cdba 100644
--- a/core/applets/logoutapplet/logout.cpp
+++ b/core/applets/logoutapplet/logout.cpp
@@ -111,6 +111,8 @@ QRESULT LogoutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **if
                 *iface = this;
         else if ( uuid == IID_MenuApplet )
                 *iface = this;
+        else
+            return QS_FALSE;
 
         if ( *iface )
                 (*iface)-> addRef ( );
diff --git a/core/applets/multikeyapplet/multikeyappletimpl.cpp b/core/applets/multikeyapplet/multikeyappletimpl.cpp
index 4644556..adf92c4 100644
--- a/core/applets/multikeyapplet/multikeyappletimpl.cpp
+++ b/core/applets/multikeyapplet/multikeyappletimpl.cpp
@@ -44,6 +44,8 @@ QRESULT MultikeyAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface
         *iface = this;
     else if ( uuid == IID_TaskbarApplet )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
diff --git a/core/applets/restartapplet/restartappletimpl.cpp b/core/applets/restartapplet/restartappletimpl.cpp
index e675c0b..5b0092d 100644
--- a/core/applets/restartapplet/restartappletimpl.cpp
+++ b/core/applets/restartapplet/restartappletimpl.cpp
@@ -51,7 +51,9 @@ QRESULT RestartAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface
   *iface = this;
     else if ( uuid == IID_TaskbarApplet )
   *iface = this;
-
+    else
+        return QS_FALSE;
+        
     if ( *iface )
   (*iface)->addRef();
     return QS_OK;
diff --git a/core/applets/restartapplet2/restart.cpp b/core/applets/restartapplet2/restart.cpp
index caed9e5..576087b 100644
--- a/core/applets/restartapplet2/restart.cpp
+++ b/core/applets/restartapplet2/restart.cpp
@@ -93,6 +93,8 @@ QRESULT RestartApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **i
     *iface = this;
   else if ( uuid == IID_MenuApplet )
     *iface = this;
+  else
+    return QS_FALSE;
 
   if ( *iface )
     (*iface)-> addRef ( );
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index 906063e..b676c74 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -242,6 +242,8 @@ QRESULT RotateApplet::queryInterface( const QUuid &uuid, QUnknownInterface **ifa
         *iface = this;
     else if ( uuid == IID_MenuApplet )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
diff --git a/core/applets/screenshotapplet/screenshotappletimpl.cpp b/core/applets/screenshotapplet/screenshotappletimpl.cpp
index a537162..4a7512e 100644
--- a/core/applets/screenshotapplet/screenshotappletimpl.cpp
+++ b/core/applets/screenshotapplet/screenshotappletimpl.cpp
@@ -50,7 +50,9 @@ QRESULT ScreenshotAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterfa
   *iface = this;
     else if ( uuid == IID_TaskbarApplet )
   *iface = this;
-
+    else
+        return QS_FALSE;
+        
     if ( *iface )
   (*iface)->addRef();
     return QS_OK;
diff --git a/core/applets/suspendapplet/suspend.cpp b/core/applets/suspendapplet/suspend.cpp
index 4bdc8fb..63f16b8 100644
--- a/core/applets/suspendapplet/suspend.cpp
+++ b/core/applets/suspendapplet/suspend.cpp
@@ -71,6 +71,8 @@ QRESULT SuspendApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **i
                 *iface = this;
         else if ( uuid == IID_MenuApplet )
                 *iface = this;
+        else
+            return QS_FALSE;
 
         if ( *iface )
                 (*iface)-> addRef ( );
diff --git a/core/applets/vmemo/vmemoimpl.cpp b/core/applets/vmemo/vmemoimpl.cpp
index ef4a3a6..71d47e5 100644
--- a/core/applets/vmemo/vmemoimpl.cpp
+++ b/core/applets/vmemo/vmemoimpl.cpp
@@ -47,6 +47,8 @@ QRESULT VMemoAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **
         *iface = this;
     else if ( uuid == IID_TaskbarApplet )
         *iface = this;
+    else
+        return QS_FALSE;
   
     if ( *iface )
         (*iface)->addRef();
diff --git a/core/applets/volumeapplet/volumeappletimpl.cpp b/core/applets/volumeapplet/volumeappletimpl.cpp
index 47506cc..80b3e74 100644
--- a/core/applets/volumeapplet/volumeappletimpl.cpp
+++ b/core/applets/volumeapplet/volumeappletimpl.cpp
@@ -51,6 +51,8 @@ QRESULT VolumeAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface *
                 *iface = this;
         else if ( uuid == IID_TaskbarApplet )
                 *iface = this;
+        else
+            return QS_FALSE;
 
         if ( *iface )
                 (*iface)->addRef();
diff --git a/core/applets/vtapplet/vt.cpp b/core/applets/vtapplet/vt.cpp
index 4cc2d60..cdd3c97 100644
--- a/core/applets/vtapplet/vt.cpp
+++ b/core/applets/vtapplet/vt.cpp
@@ -148,6 +148,8 @@ QRESULT VTApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface
                 *iface = this;
         else if ( uuid == IID_MenuApplet )
                 *iface = this;
+        else
+            return QS_FALSE;
 
         if ( *iface )
                 (*iface)-> addRef ( );
diff --git a/core/obex/obeximpl.cpp b/core/obex/obeximpl.cpp
index 5bfc779..5b53644 100644
--- a/core/obex/obeximpl.cpp
+++ b/core/obex/obeximpl.cpp
@@ -17,6 +17,8 @@ QRESULT ObexImpl::queryInterface( const QUuid& uuid, QUnknownInterface **iface )
         *iface = this;
     }else if ( uuid == IID_ObexInterface )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if (*iface)
         (*iface)->addRef();