[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.0.36.1-24-g3569969

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:56:10 CEST 2013


The branch, twofactorauth has been updated
       via  3569969754f36a7b29804440b421090917536ee7 (commit)
      from  ae0bf57f39f2f5d56231e7c817d2834021e3edac (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 |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2go/printactions.py b/x2go/printactions.py
index d6b4bf6..a1551e2 100644
--- a/x2go/printactions.py
+++ b/x2go/printactions.py
@@ -292,9 +292,8 @@ class X2goPrintActionPRINT(X2goPrintAction):
         _hr_filename = self._humanreadable_filename(pdf_file, job_title, spool_dir)
         if _X2GOCLIENT_OS == 'Windows':
             if self.printer:
-                _printer = self.printer
-            else:
-                _printer = win32print.GetDefaultPrinter()
+                _default_printer = win32print.GetDefaultPrinter()
+                win32print.SetDefaultPrinter(self.printer)
             self.logger('printing incoming PDF file %s' % pdf_file, loglevel=log.loglevel_NOTICE)
             self.logger('printer name is %s' % _printer, loglevel=log.loglevel_DEBUG)
             try:
@@ -302,7 +301,7 @@ class X2goPrintActionPRINT(X2goPrintAction):
                       0,
                       "print",
                       pdf_file,
-                      '/d:"%s"' % _printer,
+                      None,
                       ".",
                       0
                 )
@@ -313,6 +312,9 @@ class X2goPrintActionPRINT(X2goPrintAction):
                 else:
                     self.logger('Encountered win32api.error: %s' % str(e), loglevel=log.loglevel_ERROR)
 
+            if self.printer:
+                win32print.SetDefaultPrinter(_default_printer)
+
         else:
             _hr_filename = self._humanreadable_filename(pdf_file, job_title, spool_dir)
             self.logger('printing incoming PDF file %s' % _hr_filename, loglevel=log.loglevel_NOTICE)


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