summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-06-05 18:51:55 -0300
committerTomás Touceda <chiiph@leap.se>2014-06-05 18:51:55 -0300
commit1665242fc75bc34ded0afcd36fe22e4dce2efe08 (patch)
tree1a561cdffd626509df91c3811379f34289b41725 /src/leap/bitmask/services
parent3e84efac6d0278b518e0d1751dff5879652e706b (diff)
parentbc60662ccc740d191cf8a1d368e66459dd1c4ae5 (diff)
Merge remote-tracking branch 'refs/remotes/kali/bug/ui-elements-rework' into develop
Diffstat (limited to 'src/leap/bitmask/services')
-rw-r--r--src/leap/bitmask/services/eip/conductor.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/leap/bitmask/services/eip/conductor.py b/src/leap/bitmask/services/eip/conductor.py
index cde53631..a8821160 100644
--- a/src/leap/bitmask/services/eip/conductor.py
+++ b/src/leap/bitmask/services/eip/conductor.py
@@ -258,7 +258,7 @@ class EIPConductor(object):
"""
logger.debug("TLS Error: eip_stop (failed)")
self.qtsigs.connection_died_signal.emit()
- QtDelayedCall(1000, self._eip_status.eip_failed_to_restart)
+ QtDelayedCall(1000, self._eip_status.eip_failed_to_connect)
@QtCore.Slot(int)
def _eip_finished(self, exitCode):
@@ -311,8 +311,7 @@ class EIPConductor(object):
error=True)
signal = self.qtsigs.connection_died_signal
self._eip_status.show_fw_down_button()
- msg = self._eip_status.tr("Outgoing traffic is blocked")
- self._eip_status.set_eip_message(msg)
+ self._eip_status.eip_failed_to_connect()
if exitCode == 0 and IS_MAC:
# XXX remove this warning after I fix cocoasudo.