summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2014-08-09 16:01:38 -0500
committerRuben Pollan <meskio@sindominio.net>2014-08-09 16:01:38 -0500
commite841a4b55abda36c3a9a1ca7c4072d9ac37e3fa4 (patch)
tree1905448379644e4bff0bb5344eae7835f57fff3e /src/leap/bitmask/gui
parent465c0b89ca61279eb036afec2de3b4d24b257311 (diff)
parentdb9e6c728118c93413d11262993548dbeb51e28b (diff)
Merge remote-tracking branch 'kali/remove-old-comment' into develop
Diffstat (limited to 'src/leap/bitmask/gui')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 389ff172..02488af1 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -285,14 +285,8 @@ class MainWindow(QtGui.QMainWindow):
self.logout.connect(self._mail_conductor.stop_mail_services)
- # Eip machine is a public attribute where the state machine for
- # the eip connection will be available to the different components.
- # Remember that this will not live in the +1600LOC mainwindow for
- # all the eternity, so at some point we will be moving this to
- # the EIPConductor or some other clever component that we will
- # instantiate from here.
-
- # start event machines
+ # start event machines from within the eip and mail conductors
+
# TODO should encapsulate all actions into one object
self._eip_conductor.start_eip_machine(
action=self._action_eip_startstop)