[X2go-Commits] python-x2go.git - master (branch) updated: 0.2.1.1-40-g4793f3a

X2Go dev team git-admin at x2go.org
Tue Feb 12 00:28:43 CET 2013


The branch, master has been updated
       via  4793f3a5cadfc7d922403601363b2a1d46ecfc2a (commit)
       via  86055d5fdb0c0c94299946c95ffda6c468a89265 (commit)
       via  e1f9afda375bab994849fc1b3feeded185a926b4 (commit)
       via  2fcc357335868fccc00f0d778c71f9924fa140eb (commit)
      from  eafc5bb4b22a5bee841bfd97313beaa496fac941 (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 -----------------------------------------------------------------
commit 4793f3a5cadfc7d922403601363b2a1d46ecfc2a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 12 00:28:26 2013 +0100

    add fixure for X2Go BTS issue #18

commit 86055d5fdb0c0c94299946c95ffda6c468a89265
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 12 00:27:26 2013 +0100

    skip undefined print actions that get returned from HOOK_open_print_dialog hook

commit e1f9afda375bab994849fc1b3feeded185a926b4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 12 00:25:36 2013 +0100

    whitespace fixes

commit 2fcc357335868fccc00f0d778c71f9924fa140eb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 28 15:45:10 2013 +0100

    README update

-----------------------------------------------------------------------

Summary of changes:
 README                          |   24 ++++++++++++------------
 debian/changelog                |    2 +-
 x2go/backends/printing/_file.py |    6 +++---
 x2go/printactions.py            |    2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

The diff of changes is:
diff --git a/README b/README
index dc8cde4..c1535ea 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ The Python X2Go module integrates X2Go client support into your python programme
 Python X2Go is used in the headless X2Go client »pyhoca-cli« and by the tiny systray GUI
 application »pyhoca-gui«
 
-Python X2Go takes advantages of the NX Proxy by NoMachine published under GPL. 
+Python X2Go takes advantages of the NX Proxy by NoMachine published under GPL.
 On Windows and MacOS X systems you have to make sure that you have installed a current
 NX Proxy executable somewhere on your system. It probably will be sufficient to have
 the X2Go project's x2goclient package installed on your client machine.
@@ -18,22 +18,22 @@ the X2Go project's x2goclient package installed on your client machine.
 On Debian / Ubuntu systems there is a nxproxy package available within the distribution.
 Python X2Go defaults to using the distro nxproxy binary.
 
-Python X2Go was originally inspired by work of Jörg Sawatzki <joerg.sawatzki at web.de>. 
-Unfortunately, Jörg had to give up work on his ideas due to licensing issues with his 
-contractor. To make his ideas furthermore available to the OSS community this complete 
+Python X2Go was originally inspired by work of Jörg Sawatzki <joerg.sawatzki at web.de>.
+Unfortunately, Jörg had to give up work on his ideas due to licensing issues with his
+contractor. To make his ideas furthermore available to the OSS community this complete
 rewrite of Jörgs ideas has been called into life.
 
-In case you have the opinion that parts of the presented code are not as much a rewrite 
+In case you have the opinion that parts of the presented code are not as much a rewrite
 as they should be, may I ask you to contact me directly and in person. I am sure, things can
-be sorted out in a non-complicated and heartful fashion. Thanks in advance for your directness 
+be sorted out in a non-complicated and heartful fashion. Thanks in advance for your directness
 and wholeheartedness concerning this inner process.
 
 
 === Requirements ===
 
-* X2Go Server 
-    - you need a working X2Go server to connect to. In order to use shadowing make sure 
-      you have at least X2Go Baikal (3.1.x) installed
+* X2Go Server
+    - you need a working X2Go server to connect to. In order to use shadowing make sure
+      you have at least X2Go Server (>= 4.1.0.0) installed
 * on the client system you will need
     - the python-gevent library (for details refer to: http://www.gevent.org/)
     - the python-paramiko library (SSH implementation in Python, http://www.lag.net/paramiko/)
@@ -44,7 +44,7 @@ and wholeheartedness concerning this inner process.
     - also working: if no Ghostscript/GSView is installed the win32api ,,print'' command will
       be executed on incoming PDF print spool files. Win32api will try launch the print function
       of the default PDF viewer application (mostly Adobe Acrobat Reader)
-    - if you have a choice: install Ghostscript/GSview on the system that uses Python X2Go 
+    - if you have a choice: install Ghostscript/GSview on the system that uses Python X2Go
       applications... it's highly recommended
 
 
@@ -77,7 +77,7 @@ We use Launchpad for Ubuntu packaging:
   $ apt-get update
   $ apt-get install python-x2go
 
-From Ubuntu oneiric on python-x2go is also available as a part of the 
+From Ubuntu oneiric on python-x2go is also available as a part of the
 Ubuntu GNU/Linux distribution.
 
 
@@ -107,7 +107,7 @@ Testing and writing a short howto for this section is very welcome.
 === How to use it from the command line? ===
 
 A good example for the usage of Python X2Go is the pyhoca-cli programme, a headless
-X2Go client that aims at 100% compatibility with X2GoClient applications released in 
+X2Go client that aims at 100% compatibility with X2Go Client applications released in
 the X2Go project.
 
 On Debian/Ubuntu you can easily install the X2Go Client by running APT again:
diff --git a/debian/changelog b/debian/changelog
index 47fa7be..8e41c36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ python-x2go (0.4.0.0-0~x2go1) UNRELEASED; urgency=low
       True or False in cases where I/O errors occur.
     - Avoid the known_hosts file being flushed with localhost:[<someport>]
       entries. Store host keys of SSH-proxied hosts under the [<address>]:<port>
-      the system has _behind_ the SSH proxy gateway.
+      the system has _behind_ the SSH proxy gateway. (Hopefully fixes: #18).
     - Add session profile option: uniquehostkeyaliases. Allow the
       (by-design-unique) X2Go session profile ID to be a representative for
       <hostname>:<port>. Update session profile IDs on hostname changes.
diff --git a/x2go/backends/printing/_file.py b/x2go/backends/printing/_file.py
index 1dc13f6..3f606f0 100644
--- a/x2go/backends/printing/_file.py
+++ b/x2go/backends/printing/_file.py
@@ -41,15 +41,15 @@ import x2go.x2go_exceptions as x2go_exceptions
 
 _print_property_map = {
         'pdfview_cmd': {
-            'ini_section': 'view', 
+            'ini_section': 'view',
             'ini_option': 'command',
         },
         'save_to_folder': {
-            'ini_section': 'save', 
+            'ini_section': 'save',
             'ini_option': 'folder',
         },
         'printer': {
-            'ini_section': 'CUPS', 
+            'ini_section': 'CUPS',
             'ini_option': 'defaultprinter',
         },
         'print_cmd': {
diff --git a/x2go/printactions.py b/x2go/printactions.py
index 6f95ddd..23a8f83 100644
--- a/x2go/printactions.py
+++ b/x2go/printactions.py
@@ -529,6 +529,6 @@ class X2GoPrintActionDIALOG(X2GoPrintAction):
 
         self.logger('Session %s (%s) is calling X2GoClient class hook method <client_instance>.HOOK_open_print_dialog' % (self.session_name, self.profile_name), loglevel=log.loglevel_NOTICE)
         _new_print_action = self.client_instance.HOOK_open_print_dialog(profile_name=self.profile_name, session_name=self.session_name)
-        if type(_new_print_action) != type(self):
+        if _new_print_action and type(_new_print_action) != type(self):
             _new_print_action._do_print(pdf_file, job_title, spool_dir)
 


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