[X2Go-Commits] [python-x2go] 01/01: x2go/backends/terminal/plain.py: x2gosession-resume handles xinerama support differently from x2gostartagent. Adding it as cmdline parameter No. 9.

git-admin at x2go.org git-admin at x2go.org
Tue May 15 14:55:35 CEST 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit f9ab897409cd5ef96c4c1f57ca2f8980e4a661f5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue May 15 14:55:30 2018 +0200

    x2go/backends/terminal/plain.py: x2gosession-resume handles xinerama support differently from x2gostartagent. Adding it as cmdline parameter No. 9.
---
 debian/changelog                | 3 +++
 x2go/backends/terminal/plain.py | 8 +-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80e9b73..85f4ef5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ python-x2go (0.5.99.1-0x2go1) UNRELEASED; urgency=medium
       (Fixes: #1259).
     - x2go/checkhosts.py: Python3 fix in get_key_fingerprint().
     - Natively support xinerama option.
+    - x2go/backends/terminal/plain.py: x2gosession-resume handles
+      xinerama support differently from x2gostartagent. Adding it
+      as cmdline parameter No. 9.
     - x2go/utils.py: Python3 fix in get_workarea_geometry().
   * debian/: Adapt to building API docs with Sphinx.
 
diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py
index 4f7b29a..563ead7 100644
--- a/x2go/backends/terminal/plain.py
+++ b/x2go/backends/terminal/plain.py
@@ -1640,12 +1640,6 @@ class X2GoTerminalSession(object):
                 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 = []
-        if self.params.xinerama:
-            cmd_line = ['X2GO_XINERAMA=true'] + cmd_line
-        else:
-            cmd_line = ['X2GO_XINERAMA=false'] + cmd_line
-
         cmd_line = [ "x2goresume-session", self.session_info.name,
                      self.params.geometry,
                      self.params.link,
@@ -1654,7 +1648,7 @@ class X2GoTerminalSession(object):
                      self.params.kbtype,
                      setkbd,
                      self.params.clipboard,
-                     str(xinerama),
+                     self.params.xinerama,
                    ]
 
         (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git


More information about the x2go-commits mailing list