[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: a9852ead9046a5913e1c07878075b0188e03f11d
X2Go dev team
git-admin at x2go.org
Tue Jan 7 16:16:20 CET 2014
The branch, release/0.4.0.x has been updated
via a9852ead9046a5913e1c07878075b0188e03f11d (commit)
from 714dd055dab1b202541ab914e03bac06d0b67421 (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/backends/proxy/_nx3.py | 4 ++++
x2go/defaults.py | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py
index 55dbdeb..df5fb39 100644
--- a/x2go/backends/proxy/_nx3.py
+++ b/x2go/backends/proxy/_nx3.py
@@ -80,6 +80,8 @@ class X2goProxyNX3(base.X2goProxyBASE):
"retry=5",
"composite=1",
"connect=localhost",
+ "clipboard=1",
+ "menu=0",
"cookie=%s" % self.session_info.cookie,
"port=%d" % self.session_info.graphics_port,
"errors=%s" % os.path.join(".", "..", "S-%s" % self.session_info.name, self.session_log, ),
@@ -90,6 +92,8 @@ class X2goProxyNX3(base.X2goProxyBASE):
"retry=5",
"composite=1",
"connect=localhost",
+ "clipboard=1",
+ "menu=0",
"cookie=%s" % self.session_info.cookie,
"port=%d" % self.session_info.graphics_port,
"errors=%s" % os.path.join(self.session_info.local_container, self.session_log, ),
diff --git a/x2go/defaults.py b/x2go/defaults.py
index a0f0559..164b4d5 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -227,7 +227,7 @@ if X2GOCLIENT_OS == 'Windows':
'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', '-nounixkill', '-swcursor', ],
+ 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', '-wgl', ],
},
'Xming': {
'display': 'localhost:40',
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