[X2Go-Commits] [python-x2go] 01/02: x2go/utils.py: If setdpi is false, we need to enforce the default DPI (instead of dropping it from _params). Otherwise, no DPI can be set at all.

git-admin at x2go.org git-admin at x2go.org
Thu Aug 19 17:08:05 CEST 2021


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

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

commit b69c5d56009590ef58e680c3e264ec569e19e33c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Aug 19 17:06:13 2021 +0200

    x2go/utils.py: If setdpi is false, we need to enforce the default DPI (instead of dropping it from _params). Otherwise, no DPI can be set at all.
---
 debian/changelog | 3 +++
 x2go/utils.py    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cf99b6a..ed3348d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ python-x2go (0.6.1.4-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (0.6.1.4):
     - Make build (more) reproducible: no builddir in python-x2go-doc.
     - Amend SyntaxWarning ('is not' used on a literal).
+    - x2go/utils.py: If setdpi is false, we need to enforce the default DPI
+      (instead of dropping it from _params). Otherwise, no DPI can be set
+      at all.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Wed, 01 Jan 2020 20:25:50 +0100
 
diff --git a/x2go/utils.py b/x2go/utils.py
index 2935eae..10bfa25 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -334,7 +334,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
     if not _params['kbvariant'].strip(): _params['kbvariant'] = 'null'
 
     if not options['setdpi']:
-        del _params['dpi']
+        _params['dpi'] = _X2GO_SESSIONPROFILE_DEFAULTS['dpi']
     del _params['setdpi']
 
     if options['sshproxysameuser']:

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