[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: b54973e98c0dae4a7846392a74bb546e6cf1aae1

X2Go dev team git-admin at x2go.org
Wed Jan 8 15:27:47 CET 2014


The branch, build-baikal has been updated
       via  b54973e98c0dae4a7846392a74bb546e6cf1aae1 (commit)
      from  e868f6e011e06c90d676e6f7bdc9081bf42e6577 (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:
 x2go/defaults.py |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/x2go/defaults.py b/x2go/defaults.py
index 7f797a2..29577bc 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -213,7 +213,7 @@ X2GO_CLIENTPRINTING_DEFAULTS = {
 if X2GOCLIENT_OS == 'Windows':
     X2GO_CLIENTXCONFIG_DEFAULTS = {
         'XServers': {
-            'known_xservers': ['Xming', 'Cygwin-X', ],
+            'known_xservers': ['VcXsrv', 'Xming', 'Cygwin-X', ],
         },
         'Cygwin-X': {
             'display': 'localhost:40',
@@ -222,6 +222,13 @@ if X2GOCLIENT_OS == 'Windows':
             'run_command': os.path.join(os.environ['SystemDrive'], '\\', 'cygwin', 'bin', 'XWin.exe'),
             'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', ],
             },
+        'VcXsrv': {
+            'display': 'localhost:40',
+            'process_name': 'VcXsrv.exe',
+            'test_installed': os.path.join(os.environ['ProgramFiles'], 'VcXsrv', 'VcXsrv.exe'), 
+            'run_command': os.path.join(os.environ['ProgramFiles'], 'VcXsrv', 'VcXsrv.exe'),
+            'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', ],
+            },
         'Xming': {
             'display': 'localhost:40',
             'process_name': 'Xming.exe',


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