python-x2go.git - master (branch) updated: 0.1.1.4-149-g07cdbad

The branch, master has been updated
       via  07cdbad46bc21ca469e903eaf5b8a00e76e188d3 (commit)
      from  7067c12cf3a2f575872cbd8b3490efd8a6d978bd (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 07cdbad46bc21ca469e903eaf5b8a00e76e188d3
Author: Mike Gabriel <mike.gabriel@...>
Date:   Thu Mar 22 15:26:51 2012 +0100

    For the Windows version, make shipped VcXsrv-Server known to Python X2Go. The shipped VcXsrv has to rest in $CLIENTAPPDIR/VcXsrv/vcxsrv.exe.

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

Summary of changes:
 debian/changelog |    2 ++
 x2go/defaults.py |    9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2fc90f5..f23f549 100644
--- a/debian/changelog
+++ b/debian/changelog
 <at>  <at>  -58,6 +58,8  <at>  <at>  python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Fix auto_start_or_resume method when using SSH proxy with interactive
       authentication. Provide default value for PUBAPP_MAX_NO_SUBMENUS in
       defaults.py.
+    - For the Windows version, make shipped VcXsrv-Server known to Python X2Go.
+      The shipped VcXsrv has to rest in $CLIENTAPPDIR/VcXsrv/vcxsrv.exe.
   * Depend on python-xlib.

  -- Mike Gabriel <mike.gabriel@...>  Sat, 28 Sep 2012
01:44:21 +0100
diff --git a/x2go/defaults.py b/x2go/defaults.py
index 0230435..8149520 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
 <at>  <at>  -239,7 +239,7  <at>  <at>  if X2GOCLIENT_OS == 'Windows':
 if X2GOCLIENT_OS == 'Windows':
     X2GO_CLIENTXCONFIG_DEFAULTS = {
         'XServers': {
-            'known_xservers': ['VcXsrv', 'Xming', 'Cygwin-X', ],
+            'known_xservers': ['VcXsrv_shipped', 'VcXsrv', 'Xming', 'Cygwin-X', ],
         },
         'Cygwin-X': {
             'display': 'localhost:40',
 <at>  <at>  -255,6 +255,13  <at>  <at>  if X2GOCLIENT_OS == 'Windows':
             'run_command': os.path.join(os.environ['ProgramFiles'], 'VcXsrv', 'vcxsrv.exe'),
             'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill',
'-swcursor', ],
             },
+        'VcXsrv-shipped': {
+            'display': 'localhost:40',
+            'process_name': 'vcxsrv.exe',
+            'test_installed': os.path.join(os.getcwd(), 'VcXsrv', 'vcxsrv.exe'), 
+            'run_command': os.path.join(os.getcwd(), 'VcXsrv', 'vcxsrv.exe'),
+            'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill',
'-swcursor', ],
+            },
         'Xming': {
             'display': 'localhost:40',
             'process_name': 'Xming.exe',

hooks/post-receive