diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-08-20 15:10:02 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-08-20 16:38:14 -0300 |
| commit | b6ab5790e8b2ac0d67bf0eb40e474b8bed4c42dd (patch) | |
| tree | 06eecf6a96567fcf5f282caffb463c843799f883 /src/leap/bitmask/gui/mainwindow.py | |
| parent | 20122b32ad799cf93d88c86c67d52cc7004d6af8 (diff) | |
Select current provider on EIP preferences.
- Don't disconnect logout signals, so when the wizard is triggered the
UI can reflect the logout result.
- Restore the selected provider when 'other...' is selected *before* the
provider_changed signal is emitted to avoid that option to keep
selected in case of some error.
- Avoid the currentIndexChanged to be triggered when we load the providers.
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 59896bbb..e086d02a 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -413,11 +413,6 @@ class MainWindow(QtGui.QMainWindow): "Invalid username or password.")) conntrack(sig.srp_auth_bad_user_or_password, auth_bad_user_or_password) - # Logout signals - conntrack(sig.srp_logout_ok, self._logout_ok) - conntrack(sig.srp_logout_error, self._logout_error) - conntrack(sig.srp_not_logged_in_error, self._not_logged_in_error) - # EIP bootstrap signals conntrack(sig.eip_config_ready, self._eip_intermediate_stage) conntrack(sig.eip_client_certificate_ready, self._finish_eip_bootstrap) @@ -436,8 +431,12 @@ class MainWindow(QtGui.QMainWindow): sig.prov_unsupported_api.connect(self._incompatible_api) sig.prov_get_all_services.connect(self._provider_get_all_services) - # EIP start signals ============================================== + # Logout signals ================================================= + sig.srp_logout_ok.connect(self._logout_ok) + sig.srp_logout_error.connect(self._logout_error) + sig.srp_not_logged_in_error.connect(self._not_logged_in_error) + # EIP start signals ============================================== self._eip_conductor.connect_backend_signals() sig.eip_can_start.connect(self._backend_can_start_eip) sig.eip_cannot_start.connect(self._backend_cannot_start_eip) |