diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-09-30 11:50:15 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-09-30 11:50:15 -0300 |
commit | 4a4c9b91a8b62729e14c68ff99a51ca8f50cc3b3 (patch) | |
tree | 3516d1628b5c78ebe3459ae2494260060fadbac0 /src/leap/bitmask/services/eip/vpnprocess.py | |
parent | ac502ce982de1191a0af89683db517fe7c90914b (diff) | |
parent | d4df128d1e5b452eb3f8de88174991fafd70913a (diff) |
Merge remote-tracking branch 'ivan/feature/refactor-vpnlaunchers' into develop
Diffstat (limited to 'src/leap/bitmask/services/eip/vpnprocess.py')
-rw-r--r-- | src/leap/bitmask/services/eip/vpnprocess.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py index 15ac812b..707967e0 100644 --- a/src/leap/bitmask/services/eip/vpnprocess.py +++ b/src/leap/bitmask/services/eip/vpnprocess.py @@ -27,7 +27,7 @@ import socket from PySide import QtCore from leap.bitmask.config.providerconfig import ProviderConfig -from leap.bitmask.services.eip.vpnlaunchers import get_platform_launcher +from leap.bitmask.services.eip import get_vpn_launcher from leap.bitmask.services.eip.eipconfig import EIPConfig from leap.bitmask.services.eip.udstelnet import UDSTelnet from leap.bitmask.util import first @@ -697,7 +697,7 @@ class VPNProcess(protocol.ProcessProtocol, VPNManager): self._socket_host = socket_host self._socket_port = socket_port - self._launcher = get_platform_launcher() + self._launcher = get_vpn_launcher() self._last_state = None self._last_status = None |