summaryrefslogtreecommitdiff
path: root/src/leap/gui/mainwindow.py
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-06-14 04:22:35 +0900
committerkali <kali@leap.se>2013-06-14 04:22:35 +0900
commit561e7bc90f21efe5f86be7a842c283f4b7fa7610 (patch)
treeb54d62d630b9cb35900b4547ac4b7fc0bbe09e25 /src/leap/gui/mainwindow.py
parentda790dbcdaae5a11a65460e2d169833c5ee350b2 (diff)
parentc752f90f2e242b96a6a63aa56466d22d8db8ceb6 (diff)
Merge remote-tracking branch 'chiiph/bug/fix_get_domains' into develop
Diffstat (limited to 'src/leap/gui/mainwindow.py')
-rw-r--r--src/leap/gui/mainwindow.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 86f552ce..90e74823 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -805,7 +805,7 @@ class MainWindow(QtGui.QMainWindow):
if not self._already_started_eip:
self._status_panel.set_provider(
"%s@%s" % (self._login_widget.get_user(),
- self._provider_config.get_domain()))
+ self._get_best_provider_config().get_domain()))
self.ui.stackedWidget.setCurrentIndex(self.EIP_STATUS_INDEX)
@@ -952,7 +952,7 @@ class MainWindow(QtGui.QMainWindow):
self._settings.set_defaultprovider(
provider_config.get_domain())
- provider = self._provider_config.get_domain()
+ provider = provider_config.get_domain()
if self._logged_user is not None:
provider = "%s@%s" % (self._logged_user, provider)
@@ -1006,6 +1006,11 @@ class MainWindow(QtGui.QMainWindow):
self._already_started_eip = False
self._settings.set_defaultprovider(None)
+ if self._logged_user:
+ self._status_panel.set_provider(
+ "%s@%s" % (self._logged_user,
+ self._get_best_provider_config().get_domain()))
+
def _get_best_provider_config(self):
"""
Returns the best ProviderConfig to use at a moment. We may