summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui/mainwindow.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-11-01 00:04:51 -0200
committerKali Kaneko <kali@leap.se>2013-11-01 00:04:51 -0200
commitd21b490b020d5e942f1e9a27177fa9c977284f20 (patch)
treef9250bcb189be6e8aad0df86940f1323264caec3 /src/leap/bitmask/gui/mainwindow.py
parent71f53e07adfa77e1f9f2832334e90b1ffadda73a (diff)
parentbd420f8ecb15c0973496e2c0d2a3255b28b9616d (diff)
Merge branch 'develop' of ssh://leap.se/bitmask_client into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py10
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()