The branch, master has been updated via 2b79c7ec5b87a4927686b7e5039cde74e1831953 (commit) from e80e656114ad6d58d557e07a029908aa2b18b6aa (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 2b79c7ec5b87a4927686b7e5039cde74e1831953 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Apr 17 00:00:24 2012 +0200 Use nxproxy-3.5.0.12 when testing Python X2Go applications. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/proxy/_nx3.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1409c09..46b6cb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -100,6 +100,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low to start the first time if the user is new to X2Go. - Silence warnings that occur during session info queries in case a session startup has not yet been completed fully. + - Use nxproxy-3.5.0.12 when testing Python X2Go applications. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py index cfc8457..e5ada98 100644 --- a/x2go/backends/proxy/_nx3.py +++ b/x2go/backends/proxy/_nx3.py @@ -54,7 +54,7 @@ class X2goProxyNX3(base.X2goProxyBASE): os.path.join(os.environ["ProgramFiles"], os.path.normpath("PyHoca-GUI/nxproxy/nxproxy.exe")), os.path.join(os.environ["ProgramFiles"], os.path.normpath("x2goclient/nxproxy.exe")), os.path.join(os.environ["ProgramFiles"], os.path.normpath("NX Client for Windows/bin/nxproxy.exe")), - os.path.normpath("../pyhoca-contrib/mswin/nxproxy-mswin/nxproxy-3.0.4-2/nxproxy.exe"), + os.path.normpath("../pyhoca-contrib/mswin/nxproxy-mswin/nxproxy-3.5.0.12/nxproxy.exe"), ] if os.environ.has_key('NXPROXY_BINARY'): _nxproxy_paths.insert(0, os.environ['NXPROXY_BINARY']) 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).