From harvey.eneman@oracle.com Wed Dec 4 08:42:37 2013 Received: (at submit) by bugs.x2go.org; 4 Dec 2013 07:42:38 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,UNPARSEABLE_RELAY autolearn=ham version=3.3.2 X-Greylist: delayed 1724 seconds by postgrey-1.34 at ymir; Wed, 04 Dec 2013 08:42:37 CET Received: from userp1050.oracle.com (userp1050.oracle.com [156.151.31.82]) by ymir (Postfix) with ESMTPS id 6178F5DB1C for ; Wed, 4 Dec 2013 08:42:37 +0100 (CET) Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by userp1050.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id rB47Drps002915 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 4 Dec 2013 07:13:53 GMT Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id rB47DoZI022382 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 4 Dec 2013 07:13:51 GMT Received: from userz7021.oracle.com (userz7021.oracle.com [156.151.31.85]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id rB47Dn0T014143 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 4 Dec 2013 07:13:49 GMT Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by userz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id rB47Dmjb003933 for ; Wed, 4 Dec 2013 07:13:49 GMT Received: from pond.local (/10.159.142.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 03 Dec 2013 23:13:48 -0800 Message-ID: <529ED62C.10705@oracle.com> Date: Tue, 03 Dec 2013 23:13:48 -0800 From: Harvey Eneman User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:24.0) Gecko/20100101 Thunderbird/24.1.1 MIME-Version: 1.0 To: submit@bugs.x2go.org Subject: Subsequent attempts to resume a fullscreen linux session fails X-Enigmail-Version: 1.6 Content-Type: multipart/mixed; boundary="------------020107020206070008010605" X-Source-IP: userp1040.oracle.com [156.151.31.81] This is a multi-part message in MIME format. --------------020107020206070008010605 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Package: x2goserver Version: 4.0.1.7 As of version 4.0.1.7, x2gostartagent no longer includes the geometry field in the options file when fullscreen is used. Unfortunately, x2goresume-session assumes the geometry field is at position 13 and subsequently corrupts the options file. The attached patch modifies x2goresume-session to avoid the corruption by detecting whether the geometry was specified and, if not, setting an appropriate default value and reapplying the subsequent positional assignments. --------------020107020206070008010605 Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="x2goresume-session.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="x2goresume-session.patch" *** x2goserver-4.0.1.9.orig/x2goserver/bin/x2goresume-session 2013-11-28 07:20:50.000000000 -0800 --- x2goserver-4.0.1.9/x2goserver/bin/x2goresume-session 2013-12-03 16:03:45.000000000 -0800 *************** *** 131,136 **** --- 131,143 ---- KTSTR=`echo "$OPTIONS" | awk -F, {'print $12'}` LISTSTR=`echo "$OPTIONS" | awk -F, {'print $17'}` + XGSTR=`echo $GSTR | sed s/geometry=.*//` + if [ -n "$XGSTR" ]; then + GSTR="geometry=" + RSTR=`echo "$OPTIONS" | awk -F, {'print $13'}` + FSTR=`echo "$OPTIONS" | awk -F, {'print $14'}` + LISTSTR=`echo "$OPTIONS" | awk -F, {'print $16'}` + fi KTSTR=`echo "$KTSTR" | sed "s/\//\\\\\\\\\//"` X2GO_KBD_TYPE=`echo "$X2GO_KBD_TYPE" | sed "s/\//\\\\\\\\\//"` --------------020107020206070008010605--