diff options
| author | Kali Kaneko <kali@leap.se> | 2013-11-26 11:03:44 -0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-11-26 11:03:44 -0200 |
| commit | bc03b9571fcedf397daaa1451118f0a9a589d416 (patch) | |
| tree | 7e244f42844c59dc103018f6b059ae8659a751d3 /src/leap/bitmask/gui/mainwindow.py | |
| parent | 2620cd58a11d524735f0f205a1cd39ad28ad8ddb (diff) | |
| parent | 897017bfdd1ab67e2662fdd6e97b980c1e5d6258 (diff) | |
Merge remote-tracking branch 'ivan-github/feature/4490_preferences-selects-current-login-widget-provider' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index e21d6cd2..25e25e45 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -467,9 +467,9 @@ class MainWindow(QtGui.QMainWindow): Displays the preferences window. """ - preferences_window = PreferencesWindow(self, self._srp_auth, - self._provider_config, - self._soledad) + preferences_window = PreferencesWindow( + self, self._srp_auth, self._provider_config, self._soledad, + self._login_widget.get_selected_provider()) self.soledad_ready.connect(preferences_window.set_soledad_ready) preferences_window.show() |