diff options
author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-02-05 16:23:05 -0300 |
---|---|---|
committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-02-05 16:23:05 -0300 |
commit | 91f0a38f5911d0f26210f62a94ab46e741e30189 (patch) | |
tree | b1ca4bcfab84ba9a8cec6baf9daf2c70cc22b6cd /src/leap/bitmask/services/eip/conductor.py | |
parent | e046eeb7355a2ce3856eedee08bbc3d73ed7bbaa (diff) | |
parent | 1fa295ecd6af5c2ea64e76418bd144f9ddf4c803 (diff) |
Merge branch 'release/0.8.x' into develop
Diffstat (limited to 'src/leap/bitmask/services/eip/conductor.py')
-rw-r--r-- | src/leap/bitmask/services/eip/conductor.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/leap/bitmask/services/eip/conductor.py b/src/leap/bitmask/services/eip/conductor.py index 01dd7449..3fc88724 100644 --- a/src/leap/bitmask/services/eip/conductor.py +++ b/src/leap/bitmask/services/eip/conductor.py @@ -130,7 +130,6 @@ class EIPConductor(object): """ self.qtsigs.do_disconnect_signal.emit() - @QtCore.Slot() def _start_eip(self): """ Start EIP. @@ -174,7 +173,6 @@ class EIPConductor(object): self.qtsigs.disconnecting_signal.disconnect() self.qtsigs.disconnecting_signal.connect(do_stop) - @QtCore.Slot() def _stop_eip(self, restart=False, failed=False): """ TRIGGERS: @@ -244,7 +242,6 @@ class EIPConductor(object): if restart: QtDelayedCall(2000, self.reconnect_stop_signal) - @QtCore.Slot() def _do_eip_restart(self): """ TRIGGERS: @@ -266,7 +263,6 @@ class EIPConductor(object): self.qtsigs.disconnecting_signal.connect(do_stop) self.qtsigs.do_disconnect_signal.emit() - @QtCore.Slot() def _do_eip_failed(self): """ Stop EIP after a failure to start. @@ -278,7 +274,6 @@ class EIPConductor(object): self.qtsigs.connection_died_signal.emit() QtDelayedCall(1000, self._eip_status.eip_failed_to_connect) - @QtCore.Slot(int) def _eip_finished(self, exitCode): """ TRIGGERS: |