[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.0.39.0-83-g901176d
X2Go dev team
git-admin at x2go.org
Sat Sep 14 15:56:21 CEST 2013
The branch, twofactorauth has been updated
via 901176d41e2e5237e5347b59c3341df3efd589d3 (commit)
from 1030c997272c773dd8d04c9cf441c8484ebed945 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
x2go/pulseaudio.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/x2go/pulseaudio.py b/x2go/pulseaudio.py
index b6c7146..8774feb 100644
--- a/x2go/pulseaudio.py
+++ b/x2go/pulseaudio.py
@@ -25,6 +25,8 @@ __NAME__ = 'x2gopulseaudio-pylib'
from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
if _X2GOCLIENT_OS == 'Windows':
import wmi
+ import win32api
+ import win32file
import win32process
import win32event
@@ -83,6 +85,11 @@ class X2goPulseAudio(threading.Thread):
cmd_options = " %s" % " ".join(cmd_options)
self.logger('starting PulseAudio server with command line: %s%s' % (cmd, cmd_options), loglevel=log.loglevel_DEBUG)
si = win32process.STARTUPINFO()
+ _stdout_fh = win32file.CreateFile(os.path.join(os.environ('TEMP'), "pyhoca-gui_pulseaudio_stdout.log"), win32file.GENERIC_WRITE, 0, sa, win32file.OPEN_EXISTING, win32file.FILE_FLAG_SEQUENTIAL_SCAN|win32file.FILE_FLAG_OVERLAPPED , 0)
+ _stderr_fh = win32file.CreateFile(os.path.join(os.environ('TEMP'), "pyhoca-gui_pulseaudio_stderr.log"), win32file.GENERIC_WRITE, 0, sa, win32file.OPEN_EXISTING, win32file.FILE_FLAG_SEQUENTIAL_SCAN|win32file.FILE_FLAG_OVERLAPPED , 0)
+ si.hStdOutput = _stdout_fh
+ si.hStdError = _stderr_fh
+ si.jStdInput = win32api.GetStdHandle(win32api.STD_INPUT_HANDLE)
p_info = win32process.CreateProcess(None,
'%s\\%s %s' % (self.path, cmd, cmd_options),
None,
@@ -125,7 +132,7 @@ class X2goPulseAudio(threading.Thread):
win32process.TerminateProcess(hProcess, 0)
except win32process.error:
pass
-
+
def stop_thread(self):
"""\
STILL UNDOCUMENTED
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).
More information about the x2go-commits
mailing list