diff options
| author | kali <kali@leap.se> | 2012-09-20 05:00:32 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-09-20 05:00:32 +0900 |
| commit | 1ab8247ecb8664af5159b7f1e050189f5e637146 (patch) | |
| tree | 1fac7766356a2a69870fd0e00fd306131bd036a9 /src/leap/baseapp/eip.py | |
| parent | 50396fca082652dd1a1617e0d029c1c726e4c651 (diff) | |
| parent | 3c7451d62363d0a3326552956db630dda09392fa (diff) | |
Merge branch 'feature/systray-menu' into develop
Close #536.
Cleaning up of the systray menu.
Main window starts hidden if not in debug mode.
Incidentally, some fixes related to the subprocess invocation and termination, removing many of the annoying hangs during debug.
Diffstat (limited to 'src/leap/baseapp/eip.py')
| -rw-r--r-- | src/leap/baseapp/eip.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/leap/baseapp/eip.py b/src/leap/baseapp/eip.py index 8ebd84ae..98ff7142 100644 --- a/src/leap/baseapp/eip.py +++ b/src/leap/baseapp/eip.py @@ -152,13 +152,18 @@ class EIPConductorAppMixin(object): # from openvpn manager) if not self.eip_service_started: + # there is a race condition + # going on here. Depending on how long we take + # to init the qt app, the management socket + # is not ready yet. return if self.conductor.with_errors: #XXX how to wait on pkexec??? #something better that this workaround, plz!! - time.sleep(5) - logger.debug('timeout') + #I removed the pkexec pass authentication at all. + #time.sleep(5) + #logger.debug('timeout') logger.error('errors. disconnect') self.start_or_stopVPN() # is stop @@ -211,12 +216,12 @@ class EIPConductorAppMixin(object): if self.debugmode: self.startStopButton.setText('&Disconnect') self.eip_service_started = True + self.toggleEIPAct() # XXX decouple! (timer is init by icons class). # we could bring Timer Init to this Mixin # or to its own Mixin. self.timer.start(constants.TIMER_MILLISECONDS) - return if self.eip_service_started is True: @@ -224,5 +229,6 @@ class EIPConductorAppMixin(object): if self.debugmode: self.startStopButton.setText('&Connect') self.eip_service_started = False + self.toggleEIPAct() self.timer.stop() return |