[X2Go-Commits] [python-x2go] 01/01: use x2gostartagent / x2goresume-session to pass-through the clipboard parameter (requires X2Go Server 4.0.1.16 or higher)

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit 2aa779efe39a045e6492ff891e5c5ce34393d6fc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jun 29 00:20:10 2014 +0200

    use x2gostartagent / x2goresume-session to pass-through the clipboard parameter (requires X2Go Server 4.0.1.16 or higher)
---
 x2go/backends/proxy/nx3.py      |    3 ---
 x2go/backends/terminal/plain.py |    7 +++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/x2go/backends/proxy/nx3.py b/x2go/backends/proxy/nx3.py
index 8a8d44c..e15d764 100644
--- a/x2go/backends/proxy/nx3.py
+++ b/x2go/backends/proxy/nx3.py
@@ -126,9 +126,6 @@ class X2GoProxy(base.X2GoProxy):
         return cmd_line
 
     def process_proxy_options(self):
-        for idx, a in enumerate(self.PROXY_OPTIONS):
-            if a.startswith('clipboard=') and self.proxy_options.has_key('clipboard') and self.proxy_options['clipboard'] in ('both', 'server', 'client', 'none', 0, 1, "0", "1"):
-                self.PROXY_OPTIONS[idx] = 'clipboard=%s' % self.proxy_options['clipboard']
         base.X2GoProxy.process_proxy_options(self)
 
     def start_proxy(self):
diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py
index 123d6db..19be890 100644
--- a/x2go/backends/terminal/plain.py
+++ b/x2go/backends/terminal/plain.py
@@ -356,10 +356,7 @@ class X2GoTerminalSession(object):
         self.params.snd_system = str(snd_system)
         self.params.cmd = str(cmd)
         self.params.depth = str(depth)
-
-        # set the clipboard mode via proxy_options if not set externally/directly
-        if not self.proxy_options.has_key('clipboard'):
-            self.proxy_options['clipboard'] = clipboard
+        self.params.clipboard = str(clipboard)
 
         self.params.published_applications = published_applications
         self.published_applications = published_applications
@@ -1493,6 +1490,7 @@ class X2GoTerminalSession(object):
                      str(setkbd),
                      str(self.params.session_type),
                      str(self.params.cmd),
+                     str(self.params.clipboard),
                    ]
 
         if self.params.cmd == 'XDMCP' and self.params.xdmcp_server:
@@ -1584,6 +1582,7 @@ class X2GoTerminalSession(object):
                      self.params.kblayout,
                      self.params.kbtype,
                      setkbd,
+                     self.params.clipboard,
                    ]
 
         (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line)

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git