diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-08-20 11:31:02 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-08-20 11:31:02 -0300 |
| commit | 20122b32ad799cf93d88c86c67d52cc7004d6af8 (patch) | |
| tree | bfba3f01166de1b2ffc2e796f23356ed658240ae | |
| parent | 87304c2858fc7b560e3a89450d8b31e12202f713 (diff) | |
| parent | ced7ebf5407c23c3af585db4e0749c311114272f (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/provider-switch-fixes' into develop
| -rw-r--r-- | changes/bug-5995_save-provider-on-change | 1 | ||||
| -rw-r--r-- | changes/bug-5996_update-eip-status-on-change | 1 | ||||
| -rw-r--r-- | changes/bug-5997_get-ready-provider-on-change | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 10 |
4 files changed, 13 insertions, 0 deletions
diff --git a/changes/bug-5995_save-provider-on-change b/changes/bug-5995_save-provider-on-change new file mode 100644 index 00000000..e0f86d75 --- /dev/null +++ b/changes/bug-5995_save-provider-on-change @@ -0,0 +1 @@ +- Save default provider if changed on the combo box. Closes #5995. diff --git a/changes/bug-5996_update-eip-status-on-change b/changes/bug-5996_update-eip-status-on-change new file mode 100644 index 00000000..665092f0 --- /dev/null +++ b/changes/bug-5996_update-eip-status-on-change @@ -0,0 +1 @@ +- Update the EIP status on provider change. Closes #5996. diff --git a/changes/bug-5997_get-ready-provider-on-change b/changes/bug-5997_get-ready-provider-on-change new file mode 100644 index 00000000..e6b3f7f1 --- /dev/null +++ b/changes/bug-5997_get-ready-provider-on-change @@ -0,0 +1 @@ +- Update and get ready to start a provider on change. Closes #5997. diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 70a3f388..59896bbb 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -1249,9 +1249,15 @@ class MainWindow(QtGui.QMainWindow): # TODO: we need to add a check for the mail status (smtp/imap/soledad) something_runing = (self._logged_user is not None or self._already_started_eip) + provider = self._providers.get_selected_provider() + if not something_runing: if wizard: self._launch_wizard() + else: + self._settings.set_provider(provider) + self._settings.set_defaultprovider(provider) + self._update_eip_enabled_status() return title = self.tr("Stop services") @@ -1269,7 +1275,11 @@ class MainWindow(QtGui.QMainWindow): res = msg.exec_() if res == QtGui.QMessageBox.Yes: + self._settings.set_provider(provider) + self._settings.set_defaultprovider(provider) + self._settings.set_autostart_eip(False) self._stop_services() + self._update_eip_enabled_status() self._eip_conductor.qtsigs.do_disconnect_signal.emit() if wizard: self._launch_wizard() |