diff options
author | Tomás Touceda <chiiph@leap.se> | 2014-08-06 15:49:34 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2014-08-06 15:49:34 -0300 |
commit | aaec2c78dc0bf39d7d4b9ae930de9b7f95ae763c (patch) | |
tree | eec66281a67f1cc99f540b870e2876fcecb78455 /src/leap/bitmask/services/eip/conductor.py | |
parent | 0c6ec2f7a5aae716b76d508066fbb69b378fbf43 (diff) | |
parent | 9a7485bcaf5460d68b7f601927500299bb2ca9f0 (diff) |
Merge remote-tracking branch 'refs/remotes/kali/bug/fix-bad-eip-status' into develop
Diffstat (limited to 'src/leap/bitmask/services/eip/conductor.py')
-rw-r--r-- | src/leap/bitmask/services/eip/conductor.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/leap/bitmask/services/eip/conductor.py b/src/leap/bitmask/services/eip/conductor.py index b755f283..0ee56628 100644 --- a/src/leap/bitmask/services/eip/conductor.py +++ b/src/leap/bitmask/services/eip/conductor.py @@ -16,6 +16,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. """ EIP Conductor module. + +This handles Qt Signals and triggers the calls to the backend, +where the VPNProcess has been initialized. """ import logging @@ -90,7 +93,7 @@ class EIPConductor(object): def start_eip_machine(self, action): """ - Initializes and starts the EIP state machine. + Initialize and start the EIP state machine. Needs the reference to the eip_status widget not to be empty. :action: QtAction @@ -124,8 +127,12 @@ class EIPConductor(object): @QtCore.Slot() def _start_eip(self): """ - Starts EIP. + Start EIP. + + This set a couple of status flags and calls the start procedure in the + backend. """ + # TODO status should be kept in a singleton in the backend. st = self._eip_status is_restart = st and st.is_restart @@ -271,7 +278,7 @@ class EIPConductor(object): TRIGGERS: Signaler.eip_process_finished - Triggered when the EIP/VPN process finishes to set the UI + Triggered when the EIP/VPN process finishes, in order to set the UI accordingly. Ideally we would have the right exit code here, |