diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-04-24 16:56:27 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-04-24 16:56:27 -0300 |
| commit | aea6497de6b82610db7159453528a38d848a7a31 (patch) | |
| tree | eb42427635b0640521429f59d0eed4d825656b5f | |
| parent | 8b3bd20e60daa76e37548663ec1655df7ccebadd (diff) | |
| parent | 639c78246da3de6bc0d176bc64dc95ecddbbc03f (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/5551_wrong-eip-status-msg' into develop
| -rw-r--r-- | changes/bug-5551_wrong-eip-status-msg | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/changes/bug-5551_wrong-eip-status-msg b/changes/bug-5551_wrong-eip-status-msg new file mode 100644 index 00000000..9b1940a1 --- /dev/null +++ b/changes/bug-5551_wrong-eip-status-msg @@ -0,0 +1 @@ +- Client mistakenly says that traffic is routed in the clear. Closes #5551. diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 3a94a58d..b49717c9 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -1517,9 +1517,14 @@ class MainWindow(QtGui.QMainWindow): """ self._eip_connection.qtsigs.connected_signal.emit() - # check for connectivity provider_config = self._get_best_provider_config() domain = provider_config.get_domain() + + self._eip_status.set_provider(domain) + self._settings.set_defaultprovider(provider) + self._already_started_eip = True + + # check for connectivity self._check_name_resolution(domain) def _check_name_resolution(self, domain): @@ -1676,13 +1681,6 @@ class MainWindow(QtGui.QMainWindow): "system.").format(self._eip_name)) self._set_eipstatus_off() - def _on_eip_connected(self): - # XXX move to the state machine too - self._eip_status.set_provider(provider) - - self._settings.set_defaultprovider(provider) - self._already_started_eip = True - @QtCore.Slot() def _stop_eip(self): """ |