summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-12-19 17:07:27 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-12-19 17:07:27 -0300
commit52054730687efbd08efa1d36e30074d789ae2d08 (patch)
tree2515725a7ea04300022fe173acfca22fe35b5d80
parentaa1ff30f663edfd50002743acd0fa60480cd3d66 (diff)
parent2ef6913425a4cae950c01c9d00c1016afbb3206d (diff)
Merge remote-tracking branch 'chiiph/feature/display_domain_instead_of_provider_name' into develop
-rw-r--r--changes/feature_display_domain_instead_of_provider_name2
-rw-r--r--src/leap/bitmask/gui/mainwindow.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/changes/feature_display_domain_instead_of_provider_name b/changes/feature_display_domain_instead_of_provider_name
new file mode 100644
index 00000000..0b2c42a6
--- /dev/null
+++ b/changes/feature_display_domain_instead_of_provider_name
@@ -0,0 +1,2 @@
+- Display domain for provider the user has just logged in. Fixes
+ #4631. \ No newline at end of file
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 7dcb9908..96aa8074 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1015,7 +1015,7 @@ class MainWindow(QtGui.QMainWindow):
"""
self._login_widget.logged_in()
- self.ui.lblLoginProvider.setText(self._provider_config.get_name())
+ self.ui.lblLoginProvider.setText(self._provider_config.get_domain())
self._enabled_services = self._settings.get_enabled_services(
self._provider_config.get_domain())