diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-10-31 17:17:48 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-10-31 17:17:48 -0300 |
| commit | bd420f8ecb15c0973496e2c0d2a3255b28b9616d (patch) | |
| tree | d7abdfb1fbba3e122f61264624d4e447a51ce510 /src/leap/bitmask/gui/mainwindow.py | |
| parent | 1704ca96da952a17f5d06d34e2e13bc3bb499edd (diff) | |
| parent | b2a62d05985ab3bc50fc36e5b9e89765e39da58e (diff) | |
Merge remote-tracking branch 'ivan/bug/4093_change-password-policy' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index ce3f113b..5eb9e6dc 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -446,13 +446,11 @@ class MainWindow(QtGui.QMainWindow): Displays the preferences window. """ - preferences_window = PreferencesWindow(self, self._srp_auth) + preferences_window = PreferencesWindow(self, self._srp_auth, + self._provider_config) - if sameProxiedObjects(self._soledad, None): - preferences_window.set_soledad_ready(self._soledad) - else: - self.soledad_ready.connect( - lambda: preferences_window.set_soledad_ready(self._soledad)) + self.soledad_ready.connect( + lambda: preferences_window.set_soledad_ready(self._soledad)) preferences_window.show() |