[X2Go-Commits] [x2gobroker] 01/01: Revert "Don't hard-define session DPI value. This allows X2Go Client to auto-detect the client-side DPI value and use that for the X2Go session. (Fixes: #834)."

[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 x2gobroker.

commit e3276a08871aefb314530f6e252d8136a08a4375
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Apr 15 14:17:37 2015 +0200

    Revert "Don't hard-define session DPI value. This allows X2Go Client to auto-detect the client-side DPI value and use that for the X2Go session. (Fixes: #834)."
    
    This reverts commit 04a9982c4a16cdb22a7465930d95461658576993.
    
    Conflicts:
    	debian/changelog
---
 debian/changelog                           |    5 +----
 etc/broker/x2gobroker-sessionprofiles.conf |    3 +--
 x2gobroker/defaults.py                     |    3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f872d5..8918ed7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -308,9 +308,6 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
       delayed executions of broker agent tasks. This assures that SSH pub keys
       are removed via the delauthkey broker agent task, if the SSH broker
       is used. (Fixes: #491).
-    - Don't hard-define session DPI value. This allows X2Go Client to
-      auto-detect the client-side DPI value and use that for the X2Go session.
-      (Fixes: #834).
     - Add run-optional-script support to SSH broker.
     - x2gobroker-ssh: When agent query mode is set to LOCAL, Execute
       x2gobroker-agent via sudo as group "X2GOBROKER_DAEMON_GROUP". (Fixes:
@@ -321,7 +318,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
     - x2gobroker-agent.pl: Fix detection of X2Go's library path (x2gopath lib).
     - Implement "not-set" value for X2Go Client parameters. If a parameter
       is set to "not-set", the parameter won't be handed over to X2Go Client.
-      (Fixes: #836).
+      (Fixes: #834, #836).
     - agent.py: Fix missing "task" parameter for task "ping" against a local
       broker agent.
     - Fix task ping when tested via the x2gobroker-testagent script.
diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf
index 83058d7..6973d65 100644
--- a/etc/broker/x2gobroker-sessionprofiles.conf
+++ b/etc/broker/x2gobroker-sessionprofiles.conf
@@ -56,8 +56,7 @@ sound=true
 rootless=true
 iconvto=UTF-8
 soundtunnel=true
-# if no DPI default gets specified, X2Go Client will attempt detection of the client-side DPI settings
-#dpi=96
+dpi=96
 sshport=22
 setdpi=0
 pack=16m-jpeg
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index da61cfa..596d38c 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -302,8 +302,7 @@ X2GOBROKER_SESSIONPROFILE_DEFAULTS = {
         u'rootless': True,
         u'iconvto': u'UTF-8',
         u'soundtunnel': True,
-# don't define a default DPI value here, this allows X2Go Client to use its client-side detected DPI value
-#       u'dpi': 96,
+        u'dpi': 96,
         u'sshport': 22,
         u'setdpi': 0,
         u'pack': u'16m-jpeg',

--
Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git