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

[X2Go dev team]

The branch, master has been updated
       via  73ef001033d425d0c4c419a31afb887c81f7997b (commit)
       via  a40721c5da1998bdc3fda98fdcf444347c0e4bde (commit)
       via  df5827e2552a1c92a5eac8c3a84b2823e5f58091 (commit)
      from  6a73ef57bd037131f662e3f115dc332196eec786 (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 73ef001033d425d0c4c419a31afb887c81f7997b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Mar 21 14:17:32 2012 +0100

    Include development location of nxproxy in possible file locations.

commit a40721c5da1998bdc3fda98fdcf444347c0e4bde
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Mar 21 14:15:44 2012 +0100

    changelog cleanup

commit df5827e2552a1c92a5eac8c3a84b2823e5f58091
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Mar 21 09:23:10 2012 +0100

    typo fix in log output

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

Summary of changes:
 debian/changelog            |    5 +++--
 x2go/backends/proxy/_nx3.py |    1 +
 x2go/xserver.py             |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8e8897e..36cc1f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,9 +50,10 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       default language in published applications menu tree.
     - Fix X2Go printing, do not spawn a gevent process for printing.
     - Make published_applications_no_submenus an <int> session option that
-      controls how many menu items will be shown without rendering category based
-      submenus.
+      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'])
diff --git a/x2go/xserver.py b/x2go/xserver.py
index e59e2bd..e239aee 100644
--- a/x2go/xserver.py
+++ b/x2go/xserver.py
@@ -213,7 +213,7 @@ class X2goXServer(threading.Thread):
         self.xserver_name = xserver_name
         self.xserver_config = xserver_config
         if self.xserver_config.has_key('display'):
-            self.logger('settings DISPLAY environment variable to %s' % self.xserver_config['display'], loglevel=log.loglevel_NOTICE)
+            self.logger('setting DISPLAY environment variable to %s' % self.xserver_config['display'], loglevel=log.loglevel_NOTICE)
             os.environ.update({'DISPLAY': str(self.xserver_config['display'])})
         threading.Thread.__init__(self)
         self.daemon = True


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).