summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-07-10 16:24:09 -0300
committerTomás Touceda <chiiph@leap.se>2013-07-10 16:24:09 -0300
commit675d2d8d6582d87767280130bacee103ee71f070 (patch)
treed131f125d7f6e83109755a7261ff82228bd61f34 /src/leap
parentb46950d1bd05f2983bbe7ce4fefbbf29e00279b3 (diff)
parent51fb89bfb5fee46e12558a4449b5ece762d7a59a (diff)
Merge remote-tracking branch 'ivan/bug/3147_wrong-systray-icon-on-startup' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/gui/mainwindow.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 8283e72f..e8f91700 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -545,7 +545,7 @@ class MainWindow(QtGui.QMainWindow):
systrayMenu.addAction(self.ui.action_quit)
self._systray = QtGui.QSystemTrayIcon(self)
self._systray.setContextMenu(systrayMenu)
- self._systray.setIcon(self._status_panel.ERROR_ICON)
+ self._systray.setIcon(self._status_panel.ERROR_ICON_TRAY)
self._systray.setVisible(True)
self._systray.activated.connect(self._tray_activated)