The branch, master has been updated via c9357984185ea987a4378fba4c3b5236e440cb4c (commit) via bb675f711f1c336be6959f0a97608c5acfd92f85 (commit) from ff2be3893729257f9e03ef61a743ef3b8dd9cc2c (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 c9357984185ea987a4378fba4c3b5236e440cb4c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jun 23 15:29:10 2011 +0200 Force 16bit colour depth for RDP-proxy sessions. commit bb675f711f1c336be6959f0a97608c5acfd92f85 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jun 23 15:23:11 2011 +0200 typo fix ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/terminal/_stdout.py | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7c04f4b..bad9996 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ python-x2go (0.1.1.0-0~x2go1) UNRELEASED; urgency=low duplicate sessions in the session registry. - Do not start X2go service tunnels (audio, sshfs) if session startup failed. - Fix NX proxy startup post-check. + - Force 16bit colour depth for RDP-proxy sessions. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 23 Jun 2011 08:34:14 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 5b53e5a..27d3eca 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -72,9 +72,9 @@ def _rewrite_cmd(cmd, params=None): if (cmd == 'RDP') and (type(params) == X2goSessionParams): if params.geometry == 'fullscreen': - cmd = 'rdesktop -f -N %s %s' % (params.rdp_options, params.rdp_server) + cmd = 'rdesktop -f -N %s %s -a %s' % (params.rdp_options, params.rdp_server, params.depth) else: - cmd = 'rdesktop -g %s -N %s %s' % (params.geometry, params.rdp_options, params.rdp_server) + cmd = 'rdesktop -g %s -N %s %s -a %s' % (params.geometry, params.rdp_options, params.rdp_server, params.depth) # place quot marks around cmd if not empty string if cmd: @@ -277,7 +277,6 @@ class X2goTerminalSessionSTDOUT(object): self.params = X2goSessionParams() self.params.geometry = str(geometry) - self.params.depth = str(depth) self.params.link = str(link) self.params.pack = str(pack) self.params.cache_type = str(cache_type) @@ -287,6 +286,10 @@ class X2goTerminalSessionSTDOUT(object): self.params.kbtype = str(kbtype) self.params.snd_system = str(snd_system) self.params.cmd = str(cmd) + if self.params.cmd == 'RDP': + self.params.depth = '16' + else: + self.params.depth = str(depth) self.params.rdp_server = str(rdp_server) self.params.rdp_options = str(rdp_options) @@ -938,7 +941,7 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - if self.proxy.ok() + if self.proxy.ok(): self.release_proxy() self.control_session.terminate(session_name=self.session_info.name) 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).