[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0eb30cd413a6841108c9c84078c00f5eee1e479c
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:27:30 CET 2014
The branch, build-baikal has been updated
via 0eb30cd413a6841108c9c84078c00f5eee1e479c (commit)
from e0fdd569be1c024659ee863b22f6b42b3e1197c0 (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 | 6 ++++--
x2go/xserver.py | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/x2go/defaults.py b/x2go/defaults.py
index c2c1a47..4a548c9 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -166,16 +166,18 @@ if X2GOCLIENT_OS == 'Windows':
'known_xservers': ['Xming', 'Cygwin-X', ],
},
'Cygwin-X': {
+ 'display': ':40',
'process_name': 'XWin.exe',
'test_installed': os.path.join(os.environ['SystemDrive'], '\\', 'cygwin', 'bin', 'XWin.exe'),
'run_command':os.path.join(os.environ['SystemDrive'], '\\', 'cygwin', 'bin', 'XWin.exe'),
- 'parameters':[':0', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', ],
+ 'parameters':[':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', ],
},
'Xming': {
+ 'display': ':40'
'process_name': 'Xming.exe',
'test_installed': os.path.join(os.environ['ProgramFiles'], 'Xming', 'Xming.exe'),
'run_command': os.path.join(os.environ['ProgramFiles'], 'Xming', 'Xming.exe'),
- 'parameters': [':0', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', ],
+ 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', ],
},
}
diff --git a/x2go/xserver.py b/x2go/xserver.py
index 3adfcc0..5392b69 100644
--- a/x2go/xserver.py
+++ b/x2go/xserver.py
@@ -172,6 +172,8 @@ class X2goXServer(threading.Thread):
self.xserver_name = xserver_name
self.xserver_config = xserver_config
+ if self.xserver_config.has_key('display'):
+ os.environ.update({'DISPLAY': self.xserver_config['display']})
threading.Thread.__init__(self)
self.daemon = True
self.start()
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