[X2Go-Commits] [x2goserver] 04/05: Fix x2goresume-session. The several parameters placed into the NX options file are expected by x2goresume-session at very specific positions. This we broke by trying to fix the fullscreen/geometry issue in x2gostartagent. Thanks to Harvey Eneman for tracking this down!!! (Fixes: #355).

[git-admin at x2go.org]

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 75b86b7e22e8610b7531431c0a75a257823c9579
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 7 22:45:20 2013 +0100

    Fix x2goresume-session. The several parameters placed into the NX options file are expected by x2goresume-session at very specific positions. This we broke by trying to fix the fullscreen/geometry issue in x2gostartagent. Thanks to Harvey Eneman for tracking this down!!! (Fixes: #355).
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog
---
 x2goserver/bin/x2goresume-session |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 7d827de..84a02ea 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -123,14 +123,21 @@ done
 SESSION_DIR="${X2GO_ROOT}/C-${SESSION_NAME}"
 OPTIONS=`cat ${SESSION_DIR}/options`
 
-GSTR=`echo "$OPTIONS" | awk -F, {'print $13'}`
-RSTR=`echo "$OPTIONS" | awk -F, {'print $14'}`
-FSTR=`echo "$OPTIONS" | awk -F, {'print $15'}`
 LSTR=`echo "$OPTIONS" | awk -F, {'print $2'}`
 PSTR=`echo "$OPTIONS" | awk -F, {'print $3'}`
 KTSTR=`echo "$OPTIONS" | awk -F, {'print $12'}`
-LISTSTR=`echo "$OPTIONS" | awk -F, {'print $17'}`
-
+GSTR=`echo "$OPTIONS" | awk -F, {'print $13'}`
+test_GSTR=`echo $GSTR | sed s/geometry=.*//`
+if [ -n "$test_GSTR" ]; then
+	GSTR="geometry="
+	RSTR=`echo "$OPTIONS" | awk -F, {'print $13'}`
+	FSTR=`echo "$OPTIONS" | awk -F, {'print $14'}`
+	LISTSTR=`echo "$OPTIONS" | awk -F, {'print $16'}`
+else
+	RSTR=`echo "$OPTIONS" | awk -F, {'print $14'}`
+	FSTR=`echo "$OPTIONS" | awk -F, {'print $15'}`
+	LISTSTR=`echo "$OPTIONS" | awk -F, {'print $17'}`
+fi
 
 KTSTR=`echo "$KTSTR" | sed "s/\//\\\\\\\\\//"`
 X2GO_KBD_TYPE=`echo "$X2GO_KBD_TYPE" | sed "s/\//\\\\\\\\\//"`

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