[X2go-Commits] python-x2go.git - master (branch) updated: 0.2.0.9-15-g3283c83

X2Go dev team git-admin at x2go.org
Fri Sep 21 20:40:15 CEST 2012


The branch, master has been updated
       via  3283c8321733ce800331d3ba1cfd8de9c1c1bc3a (commit)
      from  2ab6c71eeea4a425ad327c9233969dd7994c6aee (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 3283c8321733ce800331d3ba1cfd8de9c1c1bc3a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Sep 21 20:40:00 2012 +0200

    Handle 16bit and 17bit colour depth (Windows clients) as equal when resuming sessions.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    2 ++
 x2go/utils.py    |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index daf5d58..a4ef284 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ python-x2go (0.2.0.10-0~x2go1) UNRELEASED; urgency=low
     - Remove bashism from X2Go server command calls. Caused servers
       with no installed x2goserver-xsession package to crash desktop
       sessions (observed with KDE4 on Ubuntu 12.04).
+    - Handle 16bit and 17bit colour depth (Windows clients) as
+      equal when resuming sessions.
   * Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 17 Aug 2012 18:29:04 +0200
diff --git a/x2go/utils.py b/x2go/utils.py
index 3f264bc..9dc38c4 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -542,6 +542,8 @@ def is_color_depth_ok(depth_session, depth_local):
         return True
     if ( ( depth_session == 24 or depth_session == 32 ) and ( depth_local == 24 or depth_local == 32 ) ):
         return True;
+    if ( ( depth_session == 16 or depth_session == 17 ) and ( depth_local == 16 or depth_local == 17 ) ):
+        return True;
     return False
 
 


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