4 files changed, 10 insertions, 3 deletions

diff --git a/libopie2/opieui/otaskbarapplet.h b/libopie2/opieui/otaskbarapplet.h
index 686b91a..773aba4 100644
--- a/libopie2/opieui/otaskbarapplet.h
+++ b/libopie2/opieui/otaskbarapplet.h
@@ -29,64 +29,66 @@
 
 */
 
 #ifndef OTASKBARAPPLET_H
 #define OTASKBARAPPLET_H
 
 #include <qpe/taskbarappletinterface.h>
 
 /*======================================================================================
  * OTaskbarAppletWrapper
  *======================================================================================*/
 
 template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
 {
   public:
     OTaskbarAppletWrapper():_applet( 0 ), ref( 0 )
     {
     }
 
     virtual ~OTaskbarAppletWrapper()
     {
         delete _applet;
     }
 
     QRESULT queryInterface( const QUuid& uuid, QUnknownInterface** iface )
     {
         qDebug( "OTaskbarAppletWrapper::queryInterface()" );
         *iface = 0;
         if ( uuid == IID_QUnknown )
             *iface = this;
         else if ( uuid == IID_TaskbarApplet )
             *iface = this;
+        else
+            return QS_FALSE;
 
         if ( *iface ) (*iface)->addRef();
         return QS_OK;
     }
 
     Q_REFCOUNT
 
     virtual T* applet( QWidget* parent )
     {
         if ( !_applet ) _applet = new T( parent );
         return _applet;
     }
 
     virtual int position() const
     {
         return T::position();
     }
 
   private:
     T* _applet;
     ulong ref;
 };
 
 #include <qframe.h>
 #include <qwidget.h>
 #include <qpe/qpeapplication.h>
 
 class QMouseEvent;
 
 /*======================================================================================
  * OTaskbarApplet
  *======================================================================================*/
diff --git a/noncore/todayplugins/fortune/fortunepluginimpl.cpp b/noncore/todayplugins/fortune/fortunepluginimpl.cpp
index 466e322..090aaa7 100644
--- a/noncore/todayplugins/fortune/fortunepluginimpl.cpp
+++ b/noncore/todayplugins/fortune/fortunepluginimpl.cpp
@@ -9,41 +9,43 @@
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "fortuneplugin.h"
 #include "fortunepluginimpl.h"
 
 FortunePluginImpl::FortunePluginImpl()
 {
         fortunePlugin  = new FortunePlugin();
 }
 
 FortunePluginImpl::~FortunePluginImpl()
 {
         delete fortunePlugin;
 }
 
 
 TodayPluginObject* FortunePluginImpl::guiPart()
 {
         return fortunePlugin;
 }
 
 QRESULT FortunePluginImpl::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( FortunePluginImpl );
 }
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp
index c17781b..ec3e34d 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp
@@ -7,40 +7,42 @@
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 
 
 #include "stocktickerplugin.h"
 #include "stocktickerpluginimpl.h"
 
 StockTickerPluginImpl::StockTickerPluginImpl() {
     stocktickerPlugin  = new StockTickerPlugin();
 }
 
 StockTickerPluginImpl::~StockTickerPluginImpl() {
     delete stocktickerPlugin;
 }
 
 
 TodayPluginObject* StockTickerPluginImpl::guiPart() {
     return stocktickerPlugin;
 }
 
 QRESULT StockTickerPluginImpl::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( StockTickerPluginImpl );
 }
diff --git a/noncore/todayplugins/weather/weatherpluginimpl.cpp b/noncore/todayplugins/weather/weatherpluginimpl.cpp
index 1a7c27b..fd32a44 100644
--- a/noncore/todayplugins/weather/weatherpluginimpl.cpp
+++ b/noncore/todayplugins/weather/weatherpluginimpl.cpp
@@ -22,41 +22,42 @@
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "weatherplugin.h"
 #include "weatherpluginimpl.h"
 
 WeatherPluginImpl::WeatherPluginImpl()
 {
         weatherPlugin = new WeatherPlugin();
 }
 
 WeatherPluginImpl::~WeatherPluginImpl()
 {
         delete weatherPlugin;
 }
 
 
 TodayPluginObject* WeatherPluginImpl::guiPart()
 {
         return weatherPlugin;
 }
 
 QRESULT WeatherPluginImpl::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( WeatherPluginImpl );
 }