summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-04-24 16:56:27 -0300
committerTomás Touceda <chiiph@leap.se>2014-04-24 16:56:27 -0300
commitaea6497de6b82610db7159453528a38d848a7a31 (patch)
treeeb42427635b0640521429f59d0eed4d825656b5f /src
parent8b3bd20e60daa76e37548663ec1655df7ccebadd (diff)
parent639c78246da3de6bc0d176bc64dc95ecddbbc03f (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/5551_wrong-eip-status-msg' into develop
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py14
1 files changed, 6 insertions, 8 deletions
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):
"""