X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsystemtray.cpp;h=8c34655044f9fb3eb676995f9b4949b657c15004;hb=edc446b0c31b048efddaf1943cb85eb0db6a0faa;hp=140f9e27499dae6e471aa1b0d01e965357f9ff8a;hpb=e543fd403c4315d8569ea09d868b6fface37b207;p=quassel.git

diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp
index 140f9e27..8c346550 100644
--- a/src/qtui/systemtray.cpp
+++ b/src/qtui/systemtray.cpp
@@ -18,6 +18,8 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 
+#ifndef QT_NO_SYSTEMTRAYICON
+
 #include <QMenu>
 
 #include "systemtray.h"
@@ -51,12 +53,16 @@ SystemTray::SystemTray(QObject *parent)
   connect(&_animationTimer, SIGNAL(timeout()), SLOT(nextPhase()));
 
   ActionCollection *coll = QtUi::actionCollection("General");
-  _trayMenu = new QMenu();
+  _trayMenu = _trayIcon->contextMenu();
+  if (!_trayMenu)
+    _trayMenu = new QMenu();
   _trayMenu->addAction(coll->action("ConnectCore"));
   _trayMenu->addAction(coll->action("DisconnectCore"));
   _trayMenu->addAction(coll->action("CoreInfo"));
+#ifndef HAVE_KDE
   _trayMenu->addSeparator();
   _trayMenu->addAction(coll->action("Quit"));
+#endif /* HAVE_KDE */
 
   _trayIcon->setContextMenu(_trayMenu);
 
@@ -189,3 +195,5 @@ void SystemTray::on_activated(QSystemTrayIcon::ActivationReason reason) {
 
   }
 }
+
+#endif /* QT_NO_SYSTEMTRAYICON */