From jlukens@botch.com Thu Feb 27 16:48:21 2014 Received: (at 138) by bugs.x2go.org; 27 Feb 2014 15:48:22 +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=0.8 required=5.0 tests=BAYES_50 autolearn=ham version=3.3.2 X-Greylist: delayed 1401 seconds by postgrey-1.34 at ymir; Thu, 27 Feb 2014 16:48:21 CET Received: from felt.botch.com (felt.botch.com [207.145.43.98]) by ymir (Postfix) with ESMTP id 1C9395DB16 for <138@bugs.x2go.org>; Thu, 27 Feb 2014 16:48:21 +0100 (CET) Received: from [127.0.0.1] (unknown [192.168.254.1]) (Authenticated sender: jlukens) by felt.botch.com (Postfix) with ESMTP id 1005A1AC0C7 for <138@bugs.x2go.org>; Thu, 27 Feb 2014 10:24:58 -0500 (EST) Date: Thu, 27 Feb 2014 10:24:58 -0500 From: Josh Lukens To: 138@bugs.x2go.org Message-ID: <6166062537DA47088D6ECB22AAC74FB9@botch.com> Subject: Possible fix X-Mailer: sparrow 1.6.4 (build 1178) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="530f58ca_46ba8fca_233f" --530f58ca_46ba8fca_233f Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Possible fix. Note, this is built on top of changes submitted in bug 440. --530f58ca_46ba8fca_233f Content-Type: application/octet-stream Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="bug138.patch" ZGlmZiAtLWdpdCBhL2h0dHBicm9rZXJjbGllbnQuY3BwIGIvaHR0cGJyb2tlcmNsaWVudC5jcHAK aW5kZXggODI3M2Q3Yy4uN2IzZjgxMCAxMDA2NDQKLS0tIGEvaHR0cGJyb2tlcmNsaWVudC5jcHAK KysrIGIvaHR0cGJyb2tlcmNsaWVudC5jcHAKQEAgLTI1NCw3ICsyNTQsOSBAQCB4MmdvRGVidWc8 PCJjYWxsZWQgZ2V0VXNlclNlc3Npb25zOiBicm9rZXJ1c2VyOiAiPDxicm9rZXJVc2VyPDwiIGJy b2tlcnBhc3M6ICI8PAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiYXV0aGlkPSI8PGNv bmZpZy0+YnJva2VyVXNlcklkOwogCiAgICAgICAgIHgyZ29EZWJ1ZyA8PCAic2VuZGluZyByZXF1 ZXN0OiAiPDwgcmVxLnRvVXRmOCgpOwotICAgICAgICBzZXNzaW9uc1JlcXVlc3Q9aHR0cC0+cG9z dCAoIFFOZXR3b3JrUmVxdWVzdChRVXJsKGNvbmZpZy0+YnJva2VydXJsKSkscmVxLnRvVXRmOCgp ICk7CisJICAgIFFOZXR3b3JrUmVxdWVzdCByZXF1ZXN0KFFVcmwoY29uZmlnLT5icm9rZXJ1cmwp KTsKKwkgICAgcmVxdWVzdC5zZXRIZWFkZXIoUU5ldHdvcmtSZXF1ZXN0OjpDb250ZW50VHlwZUhl YWRlciwgImFwcGxpY2F0aW9uL3gtd3d3LWZvcm0tdXJsZW5jb2RlZCIpOworICAgICAgICBzZXNz aW9uc1JlcXVlc3Q9aHR0cC0+cG9zdCAocmVxdWVzdCwgcmVxLnRvVXRmOCgpICk7CiAgICAgfQog ICAgIGVsc2UKICAgICB7CkBAIC0yOTAsNyArMjkyLDkgQEAgdm9pZCBIdHRwQnJva2VyQ2xpZW50 OjpzZWxlY3RVc2VyU2Vzc2lvbihjb25zdCBRU3RyaW5nJiBzZXNzaW9uKQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAicGFzc3dvcmQ9Ijw8Y29uZmlnLT5icm9rZXJQYXNzPDwiJiI8PAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiYXV0aGlkPSI8PGNvbmZpZy0+YnJva2VyVXNl cklkOwogICAgICAgICB4MmdvRGVidWcgPDwgInNlbmRpbmcgcmVxdWVzdDogIjw8IHJlcS50b1V0 ZjgoKTsKLQkJc2VsU2Vzc1JlcXVlc3Q9aHR0cC0+cG9zdCAoICBRTmV0d29ya1JlcXVlc3QoUVVy bChjb25maWctPmJyb2tlcnVybCkpLHJlcS50b1V0ZjgoKSApOworCSAgICBRTmV0d29ya1JlcXVl c3QgcmVxdWVzdChRVXJsKGNvbmZpZy0+YnJva2VydXJsKSk7CisJICAgIHJlcXVlc3Quc2V0SGVh ZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVudFR5cGVIZWFkZXIsICJhcHBsaWNhdGlvbi94LXd3 dy1mb3JtLXVybGVuY29kZWQiKTsKKyAgICAgICAgc2Vzc2lvbnNSZXF1ZXN0PWh0dHAtPnBvc3Qg KHJlcXVlc3QsIHJlcS50b1V0ZjgoKSApOwogCiAgICAgfQogICAgIGVsc2UKQEAgLTMyMyw3ICsz MjcsOSBAQCB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OmNoYW5nZVBhc3N3b3JkKFFTdHJpbmcgbmV3 UGFzcykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInBhc3N3b3JkPSI8PGNvbmZpZy0+ YnJva2VyUGFzczw8IiYiPDwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImF1dGhpZD0i PDxjb25maWctPmJyb2tlclVzZXJJZDsKICAgICAgICAgeDJnb0RlYnVnIDw8ICJzZW5kaW5nIHJl cXVlc3Q6ICI8PCByZXEudG9VdGY4KCk7Ci0gICAgICAgIGNoUGFzc1JlcXVlc3Q9aHR0cC0+cG9z dCAoICBRTmV0d29ya1JlcXVlc3QoUVVybChjb25maWctPmJyb2tlcnVybCkpLHJlcS50b1V0Zjgo KSApOworCSAgICBRTmV0d29ya1JlcXVlc3QgcmVxdWVzdChRVXJsKGNvbmZpZy0+YnJva2VydXJs KSk7CisJICAgIHJlcXVlc3Quc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVudFR5cGVI ZWFkZXIsICJhcHBsaWNhdGlvbi94LXd3dy1mb3JtLXVybGVuY29kZWQiKTsKKyAgICAgICAgc2Vz c2lvbnNSZXF1ZXN0PWh0dHAtPnBvc3QgKHJlcXVlc3QsIHJlcS50b1V0ZjgoKSApOwogCQl9CiAg ICAgZWxzZQogICAgIHsKQEAgLTM0Niw3ICszNTIsOSBAQCB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6 OnRlc3RDb25uZWN0aW9uKCkKICAgICAgICAgUVRleHRTdHJlYW0gKCAmcmVxICkgPDwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgInRhc2s9dGVzdGNvbiI7CiAgICAgICAgIHgyZ29EZWJ1 ZyA8PCAic2VuZGluZyByZXF1ZXN0OiAiPDwgcmVxLnRvVXRmOCgpOwotICAgICAgICB0ZXN0Q29u UmVxdWVzdD1odHRwLT5wb3N0ICggIFFOZXR3b3JrUmVxdWVzdChRVXJsKGNvbmZpZy0+YnJva2Vy dXJsKSkscmVxLnRvVXRmOCgpICk7CisJICAgIFFOZXR3b3JrUmVxdWVzdCByZXF1ZXN0KFFVcmwo Y29uZmlnLT5icm9rZXJ1cmwpKTsKKwkgICAgcmVxdWVzdC5zZXRIZWFkZXIoUU5ldHdvcmtSZXF1 ZXN0OjpDb250ZW50VHlwZUhlYWRlciwgImFwcGxpY2F0aW9uL3gtd3d3LWZvcm0tdXJsZW5jb2Rl ZCIpOworICAgICAgICBzZXNzaW9uc1JlcXVlc3Q9aHR0cC0+cG9zdCAocmVxdWVzdCwgcmVxLnRv VXRmOCgpICk7CiAJfQogICAgIGVsc2UKICAgICB7Cg== --530f58ca_46ba8fca_233f--