The branch, build-baikal has been updated via 8007fb608719621ae22de97f7af70204947b2a90 (commit) from d280d9aa51efa5f8041ab9577ece5db3c550b9cf (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/printactions.py | 14 +++++++++----- x2go/pulseaudio.py | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2go/printactions.py b/x2go/printactions.py index bbc8f8f..0f893c9 100644 --- a/x2go/printactions.py +++ b/x2go/printactions.py @@ -294,7 +294,7 @@ class X2goPrintActionPRINT(X2goPrintAction): _default_printer = win32print.GetDefaultPrinter() if self.printer: _printer = self.printer - win32print.SetDefaultPrinter(_printer) + win32print.SetDefaultPrinter(_printer) else: _printer = _default_printer self.logger('printing incoming PDF file %s' % pdf_file, loglevel=log.loglevel_NOTICE) @@ -303,7 +303,7 @@ class X2goPrintActionPRINT(X2goPrintAction): _stdin = file('nul', 'r') _shell = True _program_files = os.environ['ProgramFiles'] - _gsprint_bin = os.normpath(os.path.join(_program_files, 'ghostgum', 'gsview', 'gsprint.exe',)) + _gsprint_bin = os.path.normpath(os.path.join(_program_files, 'ghostgum', 'gsview', 'gsprint.exe',)) self.logger('Trying Ghostgum tool ,,gsprint.exe'' for printing first (full path: %s)' % _gsprint_bin, loglevel=log.loglevel_DEBUG) p = subprocess.Popen([_gsprint_bin, pdf_file, ], stdin=_stdin, @@ -311,7 +311,10 @@ class X2goPrintActionPRINT(X2goPrintAction): stderr=subprocess.STDOUT, shell=_shell, ) - except: + # give gsprint.exe a little time to find our printer + time.sleep(10) + + except: self.logger('Falling back to win32api printing...', loglevel=log.loglevel_DEBUG) try: win32api.ShellExecute ( @@ -322,7 +325,8 @@ class X2goPrintActionPRINT(X2goPrintAction): ".", 0 ) - time.sleep(20) + # give the win32api some time to find our printer... + time.sleep(10) except win32api.error, e: if self.client_instance: self.client_instance.HOOK_printaction_error(filename=_hr_filename, printer=_printer, err_msg=e.message, profile_name=self.profile_name, session_name=self.session_name) @@ -331,7 +335,7 @@ class X2goPrintActionPRINT(X2goPrintAction): if self.printer: win32print.SetDefaultPrinter(_default_printer) - pass + time.sleep(60) else: _hr_filename = self._humanreadable_filename(pdf_file, job_title, spool_dir) diff --git a/x2go/pulseaudio.py b/x2go/pulseaudio.py index 5a4a94d..95acb62 100644 --- a/x2go/pulseaudio.py +++ b/x2go/pulseaudio.py @@ -110,6 +110,7 @@ class X2goPulseAudio(threading.Thread): # there is no real kill command on Windows... PROCESS_TERMINATE = 1 + self.logger('PulseAudio process ID to terminate: %s' % p.pid, loglevel=log.loglevel_DEBUG) p_handle = win32api.OpenProcess(PROCESS_TERMINATE, False, p.pid) win32api.TerminateProcess(p_handle, 0) win32api.CloseHandle(p_handle) 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).