diff options
| author | Kali Kaneko <kali@leap.se> | 2013-10-14 17:33:57 -0300 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-10-14 17:33:57 -0300 |
| commit | 5d573b4f10109811b1ec7d277dfb15c548f00530 (patch) | |
| tree | 3de86f0c027a29f7dfb2dac94e3d7f9251f1018b /src/leap/bitmask/services/eip/vpnprocess.py | |
| parent | 5111539437aa98660e72a19e2468b3e3fac44942 (diff) | |
| parent | 584866689560bd2ebea01ecc5e6ae5e79ce7fc81 (diff) | |
Merge tag '0.3.4' into debian
Tag leap.bitmask version 0.3.4
Conflicts:
pkg/requirements.pip
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 |