summaryrefslogtreecommitdiff
path: root/src/leap/gui
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-06-14 00:21:40 +0900
committerkali <kali@leap.se>2013-06-14 00:21:40 +0900
commit93db3e9da1347f239eba937120c6f7fb05eaab0a (patch)
treed0b4f9736d8ff35deb4596c7cdd3c1481e5da616 /src/leap/gui
parenta318aea8f74e7b0e7cf0fb5333c89eff3e091f4a (diff)
parent09f1399db76a5c64cc38d45510b18cecd3a3d457 (diff)
Merge remote-tracking branch 'chiiph/bug/mark_already_started_false' into develop
Diffstat (limited to 'src/leap/gui')
-rw-r--r--src/leap/gui/mainwindow.py18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index d603809e..e135c798 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -194,7 +194,7 @@ class MainWindow(QtGui.QMainWindow):
self._eip_bootstrapper = EIPBootstrapper()
self._eip_bootstrapper.download_config.connect(
- self._intermediate_stage)
+ self._eip_intermediate_stage)
self._eip_bootstrapper.download_client_certificate.connect(
self._finish_eip_bootstrap)
@@ -1162,6 +1162,7 @@ class MainWindow(QtGui.QMainWindow):
else:
self._set_eip_status(data[self._eip_bootstrapper.ERROR_KEY],
error=True)
+ self._already_started_eip = False
def _logout(self):
"""
@@ -1207,6 +1208,21 @@ class MainWindow(QtGui.QMainWindow):
self._login_widget.set_status(
data[self._provider_bootstrapper.ERROR_KEY])
+ def _eip_intermediate_stage(self, data):
+ """
+ SLOT
+ TRIGGERS:
+ self._eip_bootstrapper.download_config
+
+ If there was a problem, displays it, otherwise it does nothing.
+ This is used for intermediate bootstrapping stages, in case
+ they fail.
+ """
+ passed = data[self._provider_bootstrapper.PASSED_KEY]
+ if not passed:
+ self._set_status(data[self._provider_bootstrapper.ERROR_KEY])
+ self._already_started_eip = False
+
def _eip_finished(self, exitCode):
"""
SLOT