[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.1.1.4-146-g73ef001

[X2Go dev team]

The branch, brokerclient has been updated
       via  73ef001033d425d0c4c419a31afb887c81f7997b (commit)
      from  a40721c5da1998bdc3fda98fdcf444347c0e4bde (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:
 debian/changelog            |    1 +
 x2go/backends/proxy/_nx3.py |    1 +
 2 files changed, 2 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 39d9c3f..36cc1f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       controls how many menu items will be shown without rendering category
       based submenus.
     - Support auto-resuming and auto-starting of session with Python X2Go.
+    - Include development location of nxproxy in possible file locations.
   * Depend on python-xlib.
 
  -- Mike Gabriel <mike.gabriel at 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 f508816..9d88986 100644
--- a/x2go/backends/proxy/_nx3.py
+++ b/x2go/backends/proxy/_nx3.py
@@ -54,6 +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"),
             ]
             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).