python-x2go.git - build-main (branch) updated: 0.1.1.0-1-g1f32d84 - x2go-commits

24 Jun 2011

The branch, build-main has been updated
       via  1f32d849f01fd51ead168101428386d998653544 (commit)
      from  0b8784cb8777bcb486e32a87b754ca93b98a7871 (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 |    7 +++++++
 x2go/__init__.py |    2 +-
 x2go/utils.py    |   10 +++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 8b30409..3681e1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-x2go (0.1.1.1-0~x2go1) unstable; urgency=low
+
+  * New bugfix version (0.1.1.1):
+    - Fix for local_color_depth function if no $DISPLAY is set.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 24 Jun 2011 02:07:36 +0200
+
 python-x2go (0.1.1.0-0~x2go1) unstable; urgency=low
 
   * New upstream version (0.1.1.0):
diff --git a/x2go/__init__.py b/x2go/__init__.py
index d2893d7..a388e82 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -158,7 +158,7 @@ Contact
 """
 
 __NAME__    = 'python-x2go'
-__VERSION__ = '0.1.1.0'
+__VERSION__ = '0.1.1.1'
 
 from gevent import monkey
 monkey.patch_all()
diff --git a/x2go/utils.py b/x2go/utils.py
index 089706a..46d96b2 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -406,9 +406,13 @@ def local_color_depth():
     """
     if _X2GOCLIENT_OS != 'Windows':
         p = subprocess.Popen(['xwininfo', '-root',], stdout=subprocess.PIPE, )
-        _depth_line = [ _info.strip() for _info in p.stdout.read().split('\n') if 'Depth:' in _info ][0]
-        _depth = _depth_line.split(' ')[1]
-        return int(_depth)
+        try:
+            _depth_line = [ _info.strip() for _info in p.stdout.read().split('\n') if 'Depth:' in _info ][0]
+            _depth = _depth_line.split(' ')[1]
+            return int(_depth)
+        except IndexError:
+            # a sensible default value
+            return 24
     else:
         return win32api.GetSystemMetrics(2)
 


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).

    