Refactor the system tray's context menu

[quassel.git] / src / qtui / legacysystemtray.cpp

diff --git a/src/qtui/legacysystemtray.cpp b/src/qtui/legacysystemtray.cpp
index 18bf02c..9969800 100644 (file)
--- a/src/qtui/legacysystemtray.cpp
+++ b/src/qtui/legacysystemtray.cpp
@@ -43,9 +43,6 @@ LegacySystemTray::LegacySystemTray(QWidget *parent)
   connect(_trayIcon, SIGNAL(messageClicked()),
                      SIGNAL(messageClicked()));
 
   connect(_trayIcon, SIGNAL(messageClicked()),
                      SIGNAL(messageClicked()));
 

-  setTrayMenu(_trayIcon->contextMenu());
-  _trayIcon->setContextMenu(trayMenu());
-

   _blinkTimer.setInterval(500);
   _blinkTimer.setSingleShot(false);
   connect(&_blinkTimer, SIGNAL(timeout()), SLOT(on_blinkTimeout()));
   _blinkTimer.setInterval(500);
   _blinkTimer.setSingleShot(false);
   connect(&_blinkTimer, SIGNAL(timeout()), SLOT(on_blinkTimeout()));


@@ -56,6 +53,8 @@ void LegacySystemTray::init() {
     setMode(Legacy);
 
   SystemTray::init();
     setMode(Legacy);
 
   SystemTray::init();

+
+  _trayIcon->setContextMenu(trayMenu());

 }
 
 void LegacySystemTray::syncLegacyIcon() {
 }
 
 void LegacySystemTray::syncLegacyIcon() {