Fixed restore-to-defaults in settings dialog.

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

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index b7199dc..2c20680 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -253,11 +253,13 @@ void MainWin::setupSystray() {
   systrayMenu->addSeparator();
   systrayMenu->addAction(ui.actionQuit);
 
-//   systray->setContextMenu(systrayMenu);
+  systray->setContextMenu(systrayMenu);
 
   systray->show();
+  #ifndef Q_WS_MAC
   connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )),
           this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason )));
+  #endif
 }
 
 void MainWin::connectedToCore() {
@@ -339,9 +341,6 @@ void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReas
       hide();
     }
   }
-  else {
-    systrayMenu->popup(QCursor::pos());
-  }
 }
 
 void MainWin::showNetworkDlg() {