diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-04-22 13:42:01 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-04-22 13:42:01 -0300 |
| commit | f1c54b05c06a3e02e60f8f2493a9cb8340b735c4 (patch) | |
| tree | 540a4fbcf3c887f2e302323b23d274c00132aad7 | |
| parent | eb940b04bd2921974b094150a763ad8b9bbae8ca (diff) | |
| parent | f4e3286274333af361eb4075682648f07e4ad24b (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/feature/remove-tray-popup-if-we-do-not-start-hidden' into develop
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index b911e5d8..2d854bc3 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -832,11 +832,12 @@ class MainWindow(QtGui.QMainWindow): self._mail_status.set_systray(self._systray) self._eip_status.set_systray(self._systray) - hello = lambda: self._systray.showMessage( - self.tr('Hello!'), - self.tr('Bitmask has started in the tray.')) - # we wait for the systray to be ready - reactor.callLater(1, hello) + if self._start_hidden: + hello = lambda: self._systray.showMessage( + self.tr('Hello!'), + self.tr('Bitmask has started in the tray.')) + # we wait for the systray to be ready + reactor.callLater(1, hello) @QtCore.Slot(int) def _tray_activated(self, reason=None): |