diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-05-30 13:09:16 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-05-30 13:09:16 -0300 |
| commit | 5210383ece1dcc4e2150dd1c08cc0ba4106f3b1f (patch) | |
| tree | d9aee858fb3cb342eabacaa17d4058fc724d3d2f /src/leap/bitmask/gui/mainwindow.py | |
| parent | 49b61335fedc88b5ce4a97dc3e98610b5fce74e5 (diff) | |
| parent | 8b237f08b76bc94cfcd24d13945006a89c3aeeee (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/5540_change-password-fix' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 5b8d9b1e..e7406106 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -571,10 +571,13 @@ class MainWindow(QtGui.QMainWindow): Displays the preferences window. """ - user = self._login_widget.get_user() - prov = self._login_widget.get_selected_provider() - preferences = PreferencesWindow( - self, self._backend, self._soledad_started, user, prov) + user = self._logged_user + domain = self._login_widget.get_selected_provider() + mx_provided = False + if self._provider_details is not None: + mx_provided = MX_SERVICE in self._provider_details.services + preferences = PreferencesWindow(self, user, domain, self._backend, + self._soledad_started, mx_provided) self.soledad_ready.connect(preferences.set_soledad_ready) preferences.show() |