[X2Go-Commits] [python-x2go] 01/01: x2go/utils.py: Comment 'dpi' param change above and explain that this might cause problems elsewhere. However, the applied change (setting the 'dpi' default value rather than not setting it if setdpi is False is the currently best thinkable approach).

[git-admin at x2go.org]

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

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

commit 789c74bf9af04200380dd9600b299e2ccfc79cd1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Aug 20 08:09:18 2021 +0200

    x2go/utils.py: Comment 'dpi' param change above and explain that this might cause problems elsewhere. However, the applied change (setting the 'dpi' default value rather than not setting it if setdpi is False is the currently best thinkable approach).
---
 debian/changelog | 4 ++++
 x2go/utils.py    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8960e57..4d64b70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ python-x2go (0.6.1.4-0x2go1) UNRELEASED; urgency=medium
     - 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/utils.py: Comment 'dpi' param change above and explain that this
+      might cause problems elsewhere. However, the applied change (setting
+      the 'dpi' default value rather than not setting it if setdpi is False
+      is the currently best thinkable approach).
     - x2go/client.py: Catch some (more)
       x2go_exceptions.X2GoSessionRegistryException occurrences.
 
diff --git a/x2go/utils.py b/x2go/utils.py
index 10bfa25..2c2e4a6 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -333,6 +333,10 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
     if not _params['kblayout'].strip(): _params['kblayout'] = 'null'
     if not _params['kbvariant'].strip(): _params['kbvariant'] = 'null'
 
+    # This might fire back on us some time...
+    # We need to set 'dpi' in _params as otherwise, it won't be overridable via method parameters
+    # X2GoSessionRegistry.register(). However, setting 'dpi' to a default value is different from
+    # not setting it... Let's see...
     if not options['setdpi']:
         _params['dpi'] = _X2GO_SESSIONPROFILE_DEFAULTS['dpi']
     del _params['setdpi']

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