The branch, master has been updated via c226acf269b3df217a5ec1117b9ed1525c111ef4 (commit) from cf9e6e3eaf59710e86d896a5cd80d122a1afa3e8 (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 c226acf269b3df217a5ec1117b9ed1525c111ef4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 2 17:49:07 2012 +0200 set fallback geometry if maximize is not available, fix for if clause ----------------------------------------------------------------------- Summary of changes: x2go/backends/terminal/_stdout.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 3c70978..b96964f 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -1376,12 +1376,13 @@ class X2goTerminalSessionSTDOUT(object): if self.params.geometry == 'maximize': _geometry = utils.get_workarea_geometry() - if _geometry and len(_geometry) != 2: + if _geometry is None or len(_geometry) != 2: _geometry = utils.get_desktop_geometry() if _geometry and len(_geometry) == 2: self.params.geometry = "%sx%s" % _geometry else: self.logger('failed to detect best maxmimized geometry of your client-side desktop', loglevel=log.loglevel_WARN) + self.params.geometry = "1024x768" cmd_line = [ "x2gostartagent", str(self.params.geometry), @@ -1469,12 +1470,13 @@ class X2goTerminalSessionSTDOUT(object): if self.params.geometry == 'maximize': _geometry = utils.get_workarea_geometry() - if _geometry and len(_geometry) != 2: + if _geometry is None or len(_geometry) != 2: _geometry = utils.get_desktop_geometry() if _geometry and len(_geometry) == 2: self.params.geometry = "%sx%s" % _geometry else: - self.logger('failed to detect best maxmimized geometry of your client-side desktop', loglevel=log.loglevel_WARN) + self.logger('failed to detect best maxmimized geometry of your client-side desktop, using 1024x768 instead', loglevel=log.loglevel_WARN) + self.params.geometry = "1024x768" cmd_line = [ "x2goresume-session", self.session_info.name, self.params.geometry, 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).