x2goserver.git - build-main (branch) updated: 4.0.1.7-1-g8f8a034 - x2go-commits

22 Nov 2013

The branch, build-main has been updated
       via  8f8a034e39eeefe0d5e4be04b3bd28c8eafb7d90 (commit)
      from  f09263a3bdad231b6c53563c4c84d16754e16aaf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    7 +++++++
 x2goserver/bin/x2goresume-session |    8 +-------
 2 files changed, 8 insertions(+), 7 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index d9df5e8..162629e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x2goserver (4.0.1.8-0~x2go1) UNRELEASED; urgency=low
+
+  * New upstream version (4.0.1.8):
+    - Fix resizing when resuming sessions.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 22 Nov 2013 22:13:53 +0100
+
 x2goserver (4.0.1.7-0~x2go1) unstable; urgency=low
 
   [ Orion Poplawski ]
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index a39c76e..fb0d40f 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
 


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).

    