diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-11-08 17:30:55 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-11-08 17:30:55 -0300 |
| commit | 7b3bf9ecf9e5afb0321777846638ef0c9b3e339c (patch) | |
| tree | ea833ced72a5b905305e518dd391364235075c75 | |
| parent | b2d1e649f2e8bb18e63355c305f8efa75f66cb04 (diff) | |
| parent | 6c5a431034cb423a69c8f58a16fbb39a37dec73c (diff) | |
Merge remote-tracking branch 'ivan/bug/fix-systray-bug-in-first-run' into develop
| -rw-r--r-- | src/leap/bitmask/gui/eip_status.py | 6 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mail_status.py | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py index c41d9706..1899d6a4 100644 --- a/src/leap/bitmask/gui/eip_status.py +++ b/src/leap/bitmask/gui/eip_status.py @@ -197,8 +197,10 @@ class EIPStatusWidget(QtGui.QWidget): """ Updates the system tray tooltip using the eip status. """ - eip_status = u"{0}: {1}".format(self._service_name, self._eip_status) - self._systray.set_service_tooltip(EIP_SERVICE, eip_status) + if self._systray is not None: + eip_status = u"{0}: {1}".format( + self._service_name, self._eip_status) + self._systray.set_service_tooltip(EIP_SERVICE, eip_status) def set_action_eip_startstop(self, action_eip_startstop): """ diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py index e89fb376..ec8d8f20 100644 --- a/src/leap/bitmask/gui/mail_status.py +++ b/src/leap/bitmask/gui/mail_status.py @@ -166,8 +166,9 @@ class MailStatusWidget(QtGui.QWidget): """ Updates the system tray tooltip using the mx status. """ - mx_status = u"{0}: {1}".format(self._service_name, self._mx_status) - self._systray.set_service_tooltip(MX_SERVICE, mx_status) + if self._systray is not None: + mx_status = u"{0}: {1}".format(self._service_name, self._mx_status) + self._systray.set_service_tooltip(MX_SERVICE, mx_status) def set_action_mail_status(self, action_mail_status): """ |