1 files changed, 8 insertions, 0 deletions

diff --git a/core/launcher/systray.cpp b/core/launcher/systray.cpp
index 64356ca..6122770 100644
--- a/core/launcher/systray.cpp
+++ b/core/launcher/systray.cpp
@@ -24,96 +24,104 @@
 
 #include <qlayout.h>
 #include <qdir.h>
 #include <qmessagebox.h>
 #include <qtranslator.h>
 
 #include "systray.h"
 
 #include <stdlib.h>
 
 /* ### Single build floppies ### */
 #if 0
 #ifdef QT_NO_COMPONENTS
 #include "../plugins/applets/clockapplet/clockappletimpl.h"
 #endif
 #endif
 
 SysTray::SysTray( QWidget *parent ) : QFrame( parent ), layout(0)
 {
     //setFrameStyle( QFrame::Panel | QFrame::Sunken );
     loadApplets();
 }
 
 SysTray::~SysTray()
 {
     clearApplets();
 }
 
 static int compareAppletPositions(const void *a, const void *b)
 {
     const TaskbarApplet* aa = *(const TaskbarApplet**)a;
     const TaskbarApplet* ab = *(const TaskbarApplet**)b;
     int d = ab->iface->position() - aa->iface->position();
     if ( d ) return d;
     return QString::compare(ab->name,aa->name);
 }
 
 void SysTray::loadApplets()
 {
     hide();
     clearApplets();
     addApplets();
 }
 
 void SysTray::clearApplets()
 {
 #ifndef QT_NO_COMPONENTS
 
+    /*
+     * Note on clearing. SOme applets delete their
+     * applets themselves some don't do it
+     * and on restart this can crash. If we delete it
+     * here we might end up in a double deletion. We could
+     * use QGuardedPtr but that would be one QOBject
+     * for every applet more but only useful for restart
+     */
     QValueList<TaskbarApplet>::Iterator mit;
     for ( mit = appletList.begin(); mit != appletList.end(); ++mit ) {
         (*mit).iface->release();
         (*mit).library->unload();
         delete (*mit).library;
     }
 
 #endif
     appletList.clear();
     if ( layout )
         delete layout;
     layout = new QHBoxLayout( this, 0, 1 );
     layout->setAutoAdd(TRUE);
 }
 
 void SysTray::addApplets()
 {
     hide();
 #ifndef QT_NO_COMPONENTS
     Config cfg( "Taskbar" );
     cfg.setGroup( "Applets" );
     QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' );
 
     QString lang = getenv( "LANG" );
     QString path = QPEApplication::qpeDir() + "/plugins/applets";
     QDir dir( path, "lib*.so" );
     QStringList list = dir.entryList();
     QStringList::Iterator it;
     int napplets=0;
     TaskbarApplet* *applets = new TaskbarApplet*[list.count()];
     for ( it = list.begin(); it != list.end(); ++it ) {
         if ( exclude.find( *it ) != exclude.end() )
             continue;
         TaskbarAppletInterface *iface = 0;
         QLibrary *lib = new QLibrary( path + "/" + *it );
         if (( lib->queryInterface( IID_TaskbarApplet, (QUnknownInterface**)&iface ) == QS_OK ) && iface ) {
             TaskbarApplet *applet = new TaskbarApplet;
             applets[napplets++] = applet;
             applet->library = lib;
             applet->iface = iface;
 
             QTranslator *trans = new QTranslator(qApp);
             QString type = (*it).left( (*it).find(".") );
             QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
             if ( trans->load( tfn ))
                 qApp->installTranslator( trans );
             else
                 delete trans;