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

X2Go dev team git-admin at x2go.org
Fri Sep 28 23:32:56 CEST 2012


The branch, master has been updated
       via  cb51eaa57a9f7fa5a7e44c16de8669a66efbbf32 (commit)
      from  1b4e8047d89d66cac2d2f3cce52132186de0da6d (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 cb51eaa57a9f7fa5a7e44c16de8669a66efbbf32
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Sep 28 23:32:46 2012 +0200

    move session window maximization into terminal backend

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

Summary of changes:
 x2go/backends/terminal/_stdout.py |    6 ++++++
 x2go/utils.py                     |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 3df1491..8548cd0 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -1374,6 +1374,9 @@ class X2goTerminalSessionSTDOUT(object):
 
         self.params.rewrite_session_type()
 
+        if self.params.geometry == 'maximize':
+            self.params.geometry = "%sx%s" % utils.get_workarea_geometry()
+
         cmd_line = [ "x2gostartagent",
                      str(self.params.geometry),
                      str(self.params.link),
@@ -1458,6 +1461,9 @@ class X2goTerminalSessionSTDOUT(object):
         if self.params.kbtype != "null/null":
             setkbd = "1"
 
+        if self.params.geometry == 'maximize':
+            self.params.geometry = "%sx%s" % utils.get_workarea_geometry()
+
         cmd_line = [ "x2goresume-session", self.session_info.name,
                      self.params.geometry,
                      self.params.link,
diff --git a/x2go/utils.py b/x2go/utils.py
index 93c755a..a6ee4e6 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -275,7 +275,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
     if options['fullscreen']:
         _params['geometry'] = 'fullscreen'
     elif options['maxdim']:
-        _params['geometry'] = '%sx%s' % get_workarea_geometry()
+        _params['geometry'] = 'maximize'
     else:
         _params['geometry'] = '%sx%s' % (options['width'], options['height'])
     del _params['width']


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