[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.2.1.0-4-g7be3540

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:57:54 CEST 2013


The branch, twofactorauth has been updated
       via  7be3540dfdfa45f76b2d2feccaa9c546b4399609 (commit)
      from  971b6aa66ba93d86bba14ff0b6dc74911773d175 (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:
 debian/changelog                  |    3 +++
 x2go/backends/terminal/_stdout.py |    7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c405096..6793cff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ python-x2go (0.2.1.1-0~x2go1) UNRELEASED; urgency=low
     - Make sure that internal calls to _X2goClient__list_sessions are not
       overridden by other method definitions in classes that inherit from
       X2goClient class. (Fixes: #89).
+    - Rewrite colour depth of 17 bits to 16bits when invoking rdesktop.
+      Relevant for X2Go-proxied RDP sessions started with PyHoca-GUI under
+      Windows.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 13 Dec 2012 13:32:30 +0100
 
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 1ce197f..6f474c0 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -83,10 +83,13 @@ def _rewrite_cmd(cmd, params=None):
         cmd = _X2GO_DESKTOPSESSIONS[cmd]
 
     if (cmd == 'RDP') and (type(params) == X2goSessionParams):
+        _depth = params.depth
+        if int(_depth) == 17:
+            _depth = 16
         if params.geometry == 'fullscreen':
-            cmd = 'rdesktop -f -N %s %s -a %s' % (params.rdp_options, params.rdp_server, params.depth)
+            cmd = 'rdesktop -f -N %s %s -a %s' % (params.rdp_options, params.rdp_server, _depth)
         else:
-            cmd = 'rdesktop -g %s -N %s %s -a %s' % (params.geometry, params.rdp_options, params.rdp_server, params.depth)
+            cmd = 'rdesktop -g %s -N %s %s -a %s' % (params.geometry, params.rdp_options, params.rdp_server, _depth)
 
     # place quot marks around cmd if not empty string
     if cmd:


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