[X2Go-Commits] [x2goserver] 32/33: Fix resizing when resuming sessions.

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

commit 8c194489c0511a5a531ca61398b3ce928f34062c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 22 22:14:46 2013 +0100

    Fix resizing when resuming sessions.
    
    Cherry-picked from release/4.0.1.x branch.
---
 x2goserver/bin/x2goresume-session | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 57a8914..2a3258b 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -41,7 +41,7 @@ X2GO_CLIPBOARD="${8}"
 X2GO_AGENT_PID="$("${X2GO_LIB_PATH}/x2gogetagent" "${SESSION_NAME}")"
 
 X2GO_ROOT="${HOME}/.x2go"
-X2GO_RESIZE='0'
+X2GO_RESIZE='1'
 X2GO_FULLSCREEN='0'
 
 # ${HOSTNAME} should be automatically set by bash via gethostname(2), IFF this
@@ -132,11 +132,6 @@ fi
 
 X2GO_TELEKINESIS_ENABLED="$(perl -e 'use X2Go::Config qw( get_config ); use X2Go::Utils qw( is_true ); my $Config= get_config(); print is_true($Config->param("telekinesis.enable"));')"
 
-# rootless sessions require to be resizable
-if [ "$SESSION_TYPE" == "R" ]; then
-	X2GO_RESIZE=1
-fi
-
 # rootless sessions of geometry fullscreen are invalid
 if [[ "${X2GO_GEOMETRY}" = 'fullscreen' ]] && [[ "${SESSION_TYPE}" = 'R' ]]; then
 	X2GO_GEOMETRY=''
@@ -147,7 +142,6 @@ if [[ -z "${X2GO_GEOMETRY}" ]] && [[ "${SESSION_TYPE}" = 'D' ]]; then
 	X2GO_GEOMETRY="fullscreen"
 fi
 if [[ "${X2GO_GEOMETRY}" = 'fullscreen' ]]; then
-	X2GO_RESIZE='1'
 	X2GO_FULLSCREEN='1'
 fi
 

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