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

diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp
index 140f9e27..225cd864 100644
--- a/src/qtui/systemtray.cpp
+++ b/src/qtui/systemtray.cpp
@@ -51,12 +51,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);