[X2go-Commits] python-x2go.git - build-main (branch) updated: 0.1.1.0-3-g10eebc6

X2go dev team git-admin at x2go.org
Fri Jun 24 02:22:34 CEST 2011


The branch, build-main has been updated
       via  10eebc6a425cdb1949e86b05db2dad4024927b2e (commit)
       via  6c668be841fe6a1b95dff2f1fbdeb6bfb8159879 (commit)
      from  1f32d849f01fd51ead168101428386d998653544 (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:
 x2go/cache.py   |    4 ++--
 x2go/client.py  |    6 +++---
 x2go/session.py |    5 ++---
 x2go/utils.py   |    6 +++++-
 4 files changed, 12 insertions(+), 9 deletions(-)

The diff of changes is:
diff --git a/x2go/cache.py b/x2go/cache.py
index 2a8643b..d16c04e 100644
--- a/x2go/cache.py
+++ b/x2go/cache.py
@@ -99,7 +99,7 @@ class X2goListSessionsCache(object):
         Update L{X2goListSessionsCache} for all connected session profiles.
 
         @param update_sessions: cache recent session lists from all connected servers
-        @type update_session: C{bool}
+        @type update_sessions: C{bool}
         @param update_desktops: cache recent desktop lists from all connected servers
         @type update_desktops: C{bool}
 
@@ -116,7 +116,7 @@ class X2goListSessionsCache(object):
         @param profile_name: name of profile to update
         @type profile_name: C{str}
         @param update_sessions: cache recent session list from server
-        @type update_session: C{bool}
+        @type update_sessions: C{bool}
         @param update_desktops: cache recent desktop list from server
         @type update_desktops: C{bool}
 
diff --git a/x2go/client.py b/x2go/client.py
index 49abce2..dbe19d7 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -2220,7 +2220,7 @@ class X2goClient(object):
         @type cache_types: C{tuple} or C{list}
         @param update_sessions: instead of giving a list of cache types, plainly say C{True} here, if 
             you want to update sessions in the session list cache.
-        @type update_session: C{bool}
+        @type update_sessions: C{bool}
         @param update_desktops: instead of giving a list of cache types, plainly say C{True} here, if 
             you want to update available desktops in the desktop list cache.
         @type update_desktops: C{bool}
@@ -2247,7 +2247,7 @@ class X2goClient(object):
         @type cache_types: C{tuple} or C{list}
         @param update_sessions: instead of giving a list of cache types, plainly say C{True} here, if 
             you want to update sessions in the session list cache.
-        @type update_session: C{bool}
+        @type update_sessions: C{bool}
         @param update_desktops: instead of giving a list of cache types, plainly say C{True} here, if 
             you want to update available desktops in the desktop list cache.
         @type update_desktops: C{bool}
@@ -2269,7 +2269,7 @@ class X2goClient(object):
         @type cache_types: C{tuple} or C{list}
         @param update_sessions: instead of giving a list of cache types, plainly say C{True} here, if 
             you want to update sessions in the session list cache.
-        @type update_session: C{bool}
+        @type update_sessions: C{bool}
         @param update_desktops: instead of giving a list of cache types, plainly say C{True} here, if 
             you want to update available desktops in the desktop list cache.
         @type update_desktops: C{bool}
diff --git a/x2go/session.py b/x2go/session.py
index 44986e3..cfc8770 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1195,7 +1195,7 @@ class X2goSession(object):
         Test if this C{X2goSession} is
         in a healthy state.
 
-        @return: C{True} if session is ok, C{False} otherwise
+        @return: C{BTrue} if session is ok, C{False} otherwise
         @rtype: C{bool}
 
         """
@@ -1219,8 +1219,7 @@ class X2goSession(object):
         """\
         Check if this session will display properly with the local screen's color depth.
 
-        @return: C{True} if the session will display on this client screen, False otherwise.
-            If no terminal session is yet registered with this session, C{None} is returned.
+        @return: C{True} if the session will display on this client screen, False otherwise. If no terminal session is yet registered with this session, C{None} is returned.
         @rtype C{bool}
 
         """
diff --git a/x2go/utils.py b/x2go/utils.py
index 46d96b2..a9b173c 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -405,14 +405,18 @@ def local_color_depth():
 
     """
     if _X2GOCLIENT_OS != 'Windows':
-        p = subprocess.Popen(['xwininfo', '-root',], stdout=subprocess.PIPE, )
         try:
+            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)
         except IndexError:
             # a sensible default value
             return 24
+        except OSError:
+            # for building your package...
+            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).




More information about the x2go-commits mailing list