[X2Go-Commits] [x2goserver] 03/05: Fix resizing when resuming sessions.
git-admin at x2go.org
git-admin at x2go.org
Fri Feb 21 14:21:31 CET 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch release/4.0.0.x
in repository x2goserver.
commit 018e0717b598f5b4fbaf805fa4ca720d0c347000
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Nov 22 22:14:46 2013 +0100
Fix resizing when resuming sessions.
Conflicts (resolved by Mike Gabriel):
debian/changelog
---
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 f663bc9..7d827de 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -32,7 +32,7 @@ X2GO_LIB_PATH="$(x2gopath libexec)";
X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"`
X2GO_ROOT="${HOME}/.x2go"
-X2GO_RESIZE=0
+X2GO_RESIZE=1
X2GO_FULLSCREEN=0
NX_XINERAMA_CONF="$X2GO_ROOT/C-$SESSION_NAME/xinerama.conf"
@@ -44,11 +44,6 @@ fi
$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-# 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=""
@@ -59,7 +54,6 @@ if [ "$X2GO_GEOMETRY" == "" ] && [ "$SESSION_TYPE" == "D" ]; then
X2GO_GEOMETRY="fullscreen"
fi
if [ "$X2GO_GEOMETRY" == "fullscreen" ]; then
- X2GO_RESIZE=1
X2GO_FULLSCREEN=1
fi
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list