Import release 2.0.4

src/kmessinterface.cpp

@@ -17,7 +17,12 @@
 
 #include "kmessinterface.h"
 
-#include "notification/systemtraywidget.h"
+#ifdef HAVE_NEW_TRAY
+  #include "notification/newsystemtraywidget.h"
+#else
+  #include "notification/systemtraywidget.h"
+#endif
+
 #include "settings/globalsettingsdialog.h"
 #include "utils/likeback/likeback.h"
 #include "utils/kmessconfig.h"
@@ -63,7 +68,7 @@ KMessInterface::KMessInterface( QWidget *parent )
 KMessInterface::~KMessInterface()
 {
   delete statusLabel_;
-  delete systemTrayWidget_;
+
 #ifdef KMESSDEBUG_KMESSINTERFACE
   kDebug() << "DESTROYED.";
 #endif
@@ -429,16 +434,13 @@ bool KMessInterface::initSystemTrayWidget()
   menu->addAction( showSettingsAction_ );
   menu->addAction( globalSettings_ );
 
+#ifndef HAVE_NEW_TRAY
   // Make the connections for the system tray widget
   connect( systemTrayWidget_, SIGNAL( quitSelected() ),
            this,              SLOT  (     menuQuit() ) );
-
   systemTrayWidget_->show();
-
-#ifdef KMESSTEST
-  KMESS_ASSERT( systemTrayWidget_ != 0 );
-  KMESS_ASSERT( systemTrayWidget_->isVisible() );
 #endif
+
   return true;
 }