diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-08-06 15:49:34 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-08-06 15:49:34 -0300 |
| commit | aaec2c78dc0bf39d7d4b9ae930de9b7f95ae763c (patch) | |
| tree | eec66281a67f1cc99f540b870e2876fcecb78455 /src/leap/bitmask/gui | |
| parent | 0c6ec2f7a5aae716b76d508066fbb69b378fbf43 (diff) | |
| parent | 9a7485bcaf5460d68b7f601927500299bb2ca9f0 (diff) | |
Merge remote-tracking branch 'refs/remotes/kali/bug/fix-bad-eip-status' into develop
Diffstat (limited to 'src/leap/bitmask/gui')
| -rw-r--r-- | src/leap/bitmask/gui/eip_status.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py index f283b148..1e764a8c 100644 --- a/src/leap/bitmask/gui/eip_status.py +++ b/src/leap/bitmask/gui/eip_status.py @@ -367,6 +367,7 @@ class EIPStatusWidget(QtGui.QWidget): leap_assert_type(error, bool) if error: logger.error(status) + self.hide_eip_cancel_button() else: logger.debug(status) self._eip_status = status @@ -723,9 +724,17 @@ class EIPStatusWidget(QtGui.QWidget): def _on_eip_vpn_launcher_exception(self): # XXX We should implement again translatable exceptions so # we can pass a translatable string to the panel (usermessage attr) - self.set_eip_status("VPN Launcher error.", error=True) + # FIXME this logic should belong to the backend, not to this + # widget. self.set_eipstatus_off() + st = self.tr("VPN Launcher error. See the logs for more info.") + self.set_eip_status(st, error=True) + + msg = self.tr("Encrypted Internet failed to start") + self.set_eip_message(msg) + self.show_fw_down_button() + self.aborted() def _on_eip_no_polkit_agent_error(self): |