The branch, master has been updated via ff0d0346071b860a4df52c84701c0b069b0850f4 (commit) from 3700b78b9d145fe5d816fd1c3faccb938f1e0915 (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 ----------------------------------------------------------------- commit ff0d0346071b860a4df52c84701c0b069b0850f4 Author: Mike Gabriel <mike.gabriel@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). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ x2goserver/bin/x2goresume-session | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cbe8b9f..74cb467 100644 --- a/debian/changelog +++ b/debian/changelog @@ -65,6 +65,11 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low + * New upstream version (4.0.1.10): + - 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). * Grab systemd service file from Fedora and ship it upstream. * Add init script for RPM based distro. Taken from the Fedora package. diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 4afe24b..12669c2 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -129,14 +129,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/\//\\\\\\\\\//"` 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).