From unknown Wed Apr 29 13:27:08 2026 X-Loop: owner@bugs.x2go.org Subject: Bug#177: New patch for this feature Reply-To: Ricardo =?UTF-8?Q?D=C3=ADaz_?= =?UTF-8?Q?Mart=C3=ADn?= , 177@bugs.x2go.org Resent-From: Ricardo =?UTF-8?Q?D=C3=ADaz_?= =?UTF-8?Q?Mart=C3=ADn?= Original-Sender: oceanosoftlapalma@gmail.com Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Fri, 19 Apr 2013 18:18:01 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: followup 177 X-X2Go-PR-Package: x2goclient X-X2Go-PR-Keywords: Received: via spool by 177-submit@bugs.x2go.org id=B177.136639519716575 (code B ref 177); Fri, 19 Apr 2013 18:18:01 +0000 Received: (at 177) by bugs.x2go.org; 19 Apr 2013 18:13:17 +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.7 required=5.0 tests=RCVD_IN_DNSWL_LOW, T_DKIM_INVALID autolearn=ham version=3.3.2 Received: from mail-ie0-f169.google.com (mail-ie0-f169.google.com [209.85.223.169]) by ymir (Postfix) with ESMTPS id E926B5DB05 for <177@bugs.x2go.org>; Fri, 19 Apr 2013 20:13:15 +0200 (CEST) Received: by mail-ie0-f169.google.com with SMTP id ar20so5125251iec.0 for <177@bugs.x2go.org>; Fri, 19 Apr 2013 11:13:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:sender:date:x-google-sender-auth:message-id :subject:from:to:content-type; bh=aD3iU7tWiPq2TC8int1LoAm+u15WmQXQ/Usbe16GR9c=; b=IYJbLEHeR2leCKRyPuUcy3v7J+fWPgPQHMkHP8cGnImFLKB5hQ0dCE/7zZ6HU9DG9o ZO7Ib8J4E9VF/JdiGvaLUy8zpfP0+9x8OLTQoIOIj/U2GUTpvp+yi2KbmprHjFhbGbuz h/6/qsQsO27odCOC9QXZitSXr4IojhhBI5vAKXe8qiUVjcm6BEf30hfmvZtSBV49FrAz KBzX5/CM3O7HR652MNwwp27D+naOYHaye+9Y4HtRGQmv5qw2koGer3VVUzv/E1TPY9h3 ikhpoxhV9KZZ/IXLMT718Rjygyhy9fsJdmjCiuc4/rKuUZIXtglA7d0n5S+SIZ2C9nA5 bKZQ== MIME-Version: 1.0 X-Received: by 10.50.213.41 with SMTP id np9mr2570283igc.79.1366395194433; Fri, 19 Apr 2013 11:13:14 -0700 (PDT) Sender: oceanosoftlapalma@gmail.com Received: by 10.231.237.194 with HTTP; Fri, 19 Apr 2013 11:13:14 -0700 (PDT) Date: Fri, 19 Apr 2013 20:13:14 +0200 X-Google-Sender-Auth: e2atT_uHM9cNU5I96wbFfvh3S_k Message-ID: From: Ricardo =?UTF-8?Q?D=C3=ADaz_?= =?UTF-8?Q?Mart=C3=ADn?= To: 177@bugs.x2go.org Content-Type: multipart/mixed; boundary=f46d04462eb62fe83d04dabaac7f --f46d04462eb62fe83d04dabaac7f Content-Type: text/plain; charset=UTF-8 This patch fix the bug when x2goclient setting show in trayicon is setted to false. I introduce extra feature: a trayicon message is showed while x2go session selectors are minimized to trayicon and x2go session has not window yet. If somebody thinks it's not a good idea please let me know. Regards, -- --f46d04462eb62fe83d04dabaac7f Content-Type: application/octet-stream; name="0005-set-trayicon-to-session-s-icon.patch" Content-Disposition: attachment; filename="0005-set-trayicon-to-session-s-icon.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hfpoetwg0 RnJvbSAxZDY4MDZmZjIwMjM0ZDdlM2E5ODRmMzRmMTQzZTkzYjdhZWJiZWZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSaWNhcmRvIERpYXogPG9jZWFub3NvZnRsYXBhbG1hQGdtYWls LmNvbT4KRGF0ZTogRnJpLCAxOSBBcHIgMjAxMyAxOTo1MjozMiArMDIwMApTdWJqZWN0OiBbUEFU Q0ggNS81XSBzZXQgdHJheWljb24gdG8gc2Vzc2lvbidzIGljb24KCi0tLQogb25tYWlud2luZG93 LmNwcCB8ICAgNjAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLS0tCiBvbm1haW53aW5kb3cuaCAgIHwgICAgMyArKysKIDIgZmlsZXMgY2hhbmdlZCwg NDEgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvb25tYWlud2lu ZG93LmNwcCBiL29ubWFpbndpbmRvdy5jcHAKaW5kZXggMGUzNWNkOC4uNjY2NzBiYyAxMDA2NDQK LS0tIGEvb25tYWlud2luZG93LmNwcAorKysgYi9vbm1haW53aW5kb3cuY3BwCkBAIC0xNDI4LDI2 ICsxNDI4LDYgQEAgdm9pZCBPTk1haW5XaW5kb3c6OmhpZGVFdmVudChRSGlkZUV2ZW50KiBldmVu dCkKICAgICBpZiAoZXZlbnQtPnNwb250YW5lb3VzKCkgJiYgdHJheU1pblRvVHJheSkKICAgICAg ICAgaGlkZSgpOwogCi0gICAgLy9zZXQgc2Vzc2lvbiBpY29uIHRvIHRyYXkgaWNvbgotICAgIGlm ICh0cmF5SWNvbikgewotCi0gICAgICAgIFgyZ29TZXR0aW5ncyogc3Q7Ci0KLSAgICAgICAgaWYg KCFicm9rZXJNb2RlKQotICAgICAgICAgICAgc3Q9bmV3IFgyZ29TZXR0aW5ncyggInNlc3Npb25z IiApOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBzdD0gbmV3IFgyZ29TZXR0aW5ncyhjb25m aWcuaW5pRmlsZSxRU2V0dGluZ3M6OkluaUZvcm1hdCk7Ci0KLSAgICAgICAgUVN0cmluZyBzaWQ7 Ci0gICAgICAgIGlmICggIWVtYmVkTW9kZSApCi0gICAgICAgICAgICBzaWQ9bGFzdFNlc3Npb24t PmlkKCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHNpZD0iZW1iZWRkZWQiOwotCi0gICAg ICAgIC8vdHJheUljb24tPnNldEljb24oUUljb24gKCAiOmljb25zLzEyOHgxMjgveDJnby5wbmci KSApOwotICAgICAgICBRU3RyaW5nIGltYWdlUGF0aCA9IHN0LT5zZXR0aW5nKCktPnZhbHVlKHNp ZCArICIvaWNvbiIsIChRVmFyaWFudCkgUVN0cmluZygiOmljb25zLzEyOHgxMjgveDJnby5wbmci KSkudG9TdHJpbmcoKTsKLSAgICAgICAgdHJheUljb24tPnNldEljb24oUUljb24gKGltYWdlUGF0 aCkpOwotICAgIH0KIH0KIAogCkBAIC0zNjMzLDcgKzM2MTMsNyBAQCB2b2lkIE9OTWFpbldpbmRv dzo6c3RhcnROZXdTZXNzaW9uKCkKICAgICAgICAgLy9pZiBtdWx0aWRpc3BsYXkgPSB0cnVlIG9y IG1heGRpbSA9IHRydWUgd2Ugc2V0IG1heGltdW4gZGlzcGxheSBhcmVhIGF2YWlsYWJsZSBmb3Ig dGhlIHNlbGVjY3RlZCBtb25pdG9yCiAgICAgICAgIGlmIChzdC0+c2V0dGluZygpLT52YWx1ZShz aWQgKyAiL211bHRpZGlzcCIsIChRVmFyaWFudCkgZmFsc2UpLnRvQm9vbCgpIHx8IHN0LT5zZXR0 aW5nKCktPnZhbHVlKHNpZCArICIvbWF4ZGltIiwgKFFWYXJpYW50KSBmYWxzZSkudG9Cb29sKCkp IHsKICAgICAgICAgICAgIGludCBzZWxlY3RlZFNjcmVlbiA9IHN0LT5zZXR0aW5nKCktPnZhbHVl KHNpZCArICIvZGlzcGxheSIsIChRVmFyaWFudCkgLTEpLnRvSW50KCk7Ci0gICAgICAgICAgICBo ZWlnaHQ9UUFwcGxpY2F0aW9uOjpkZXNrdG9wKCktPmF2YWlsYWJsZUdlb21ldHJ5KHNlbGVjdGVk U2NyZWVuKS5oZWlnaHQoKTsKKyAgICAgICAgICAgIGhlaWdodD1RQXBwbGljYXRpb246OmRlc2t0 b3AoKS0+YXZhaWxhYmxlR2VvbWV0cnkoc2VsZWN0ZWRTY3JlZW4pLmhlaWdodCgpIC0gMTA7CiAg ICAgICAgICAgICB3aWR0aD1RQXBwbGljYXRpb246OmRlc2t0b3AoKS0+YXZhaWxhYmxlR2VvbWV0 cnkoc2VsZWN0ZWRTY3JlZW4pLndpZHRoKCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAg ICBoZWlnaHQ9c3QtPnNldHRpbmcoKS0+dmFsdWUgKCBzaWQrIi9oZWlnaHQiLApAQCAtMzg4MSw4 ICszODYxLDEwIEBAIHZvaWQgT05NYWluV2luZG93OjpzdGFydE5ld1Nlc3Npb24oKQogICAgIHNz aENvbm5lY3Rpb24tPmV4ZWN1dGVDb21tYW5kICggY21kLCB0aGlzLCBTTE9UICggc2xvdFJldFJl c3VtZVNlc3MgKCBib29sLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUVN0 cmluZyxpbnQgKSApICk7CiAgICAgcGFzc0Zvcm0tPmhpZGUoKTsKLX0KIAorICAgIC8vY2hhbmdl IHRoZSB0cmF5aWNvbiBwaWN0dXJlCisgICAgc2V0VHJheUljb25Ub1Nlc3Npb25JY29uKHRyKCJD cmVhdGluZyBuZXcgc2Vzc2lvbi4uLiIpKTsKK30KIAogCiB2b2lkIE9OTWFpbldpbmRvdzo6cmVz dW1lU2Vzc2lvbiAoIGNvbnN0IHgyZ29TZXNzaW9uJiBzICkKQEAgLTQxMTcsOCArNDA5OSw0MiBA QCB2b2lkIE9OTWFpbldpbmRvdzo6cmVzdW1lU2Vzc2lvbiAoIGNvbnN0IHgyZ29TZXNzaW9uJiBz ICkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCApICkpOwogICAgIHJl c3VtaW5nU2Vzc2lvbj1zOwogICAgIHBhc3NGb3JtLT5oaWRlKCk7CisKKyAgICAvL2NoYW5nZSB0 aGUgdHJheWljb24gcGljdHVyZQorICAgIHNldFRyYXlJY29uVG9TZXNzaW9uSWNvbih0cigiUmVz dG9yaW5nIHNlc3Npb24uLi4iKSk7CisKIH0KIAorLyoKKyAqIHNldCB0aGUgdHJheSBzZXNzaW9u IGljb24gcGljdHVyZSBhcyB0cmF5IGljb24gcGljdHVyZSBhbmQgc2hvdyBhIHRyYXkgaWNvbiBp bmZvcm1hdGlvbiBtZXNzYWdlIGFib3V0IHNvbWV0aGluZyBpcyBkb2luZworICogdGhpcyBtZXNz YWdlIGF2b2lkIHRoZSB1c2VycyB0aGlua3Mgbm90aGluaCBoYXBwZW5kIGZvciBzb21lIHNlY29u ZHMgd2hpbGUgeDJnbyBzZXNzaW9uIHdpbmRvdyBpcyBzaG93ZWQKKyAqLwordm9pZCBPTk1haW5X aW5kb3c6OnNldFRyYXlJY29uVG9TZXNzaW9uSWNvbihRU3RyaW5nIGluZm8pIHsKKworICAgIC8v c2V0IHNlc3Npb24gaWNvbiB0byB0cmF5IGljb24KKyAgICBpZiAodHJheUljb24gJiYgbGFzdFNl c3Npb24pIHsKKworICAgICAgICBYMmdvU2V0dGluZ3MqIHN0OworCisgICAgICAgIGlmICghYnJv a2VyTW9kZSkKKyAgICAgICAgICAgIHN0PW5ldyBYMmdvU2V0dGluZ3MoICJzZXNzaW9ucyIgKTsK KyAgICAgICAgZWxzZQorICAgICAgICAgICAgc3Q9IG5ldyBYMmdvU2V0dGluZ3MoY29uZmlnLmlu aUZpbGUsUVNldHRpbmdzOjpJbmlGb3JtYXQpOworCisgICAgICAgIFFTdHJpbmcgc2lkOworICAg ICAgICBpZiAoICFlbWJlZE1vZGUgKQorICAgICAgICAgICAgc2lkPWxhc3RTZXNzaW9uLT5pZCgp OworICAgICAgICBlbHNlCisgICAgICAgICAgICBzaWQ9ImVtYmVkZGVkIjsKKworICAgICAgICBR U3RyaW5nIGltYWdlUGF0aCA9IHN0LT5zZXR0aW5nKCktPnZhbHVlKHNpZCArICIvaWNvbiIsIChR VmFyaWFudCkgUVN0cmluZygiOmljb25zLzEyOHgxMjgveDJnby5wbmciKSkudG9TdHJpbmcoKTsK KyAgICAgICAgdHJheUljb24tPnNldEljb24oUUljb24gKGltYWdlUGF0aCkpOworCisgICAgICAg IC8vc2VuZCBhIGluZm9ybWF0aW9uIG5vdGlmaWNhdGlvbiBhYm91dCB0aGUgY29ubmVjdGlvbiBp cyBkb25lCisgICAgICAgIHRyYXlJY29uLT5zaG93TWVzc2FnZSh0cigiWDJHbyIpLCB0ciAoIkVz dGFibGlzaGVkIGNvbm5lY3Rpb25cbiIpICsgaW5mbywgUVN5c3RlbVRyYXlJY29uOjpJbmZvcm1h dGlvbiwgMTUwMDApOworICAgIH0KKworfQogCiB2b2lkIE9OTWFpbldpbmRvdzo6c2VsZWN0U2Vz c2lvbiAoIFFTdHJpbmdMaXN0JiBzZXNzaW9ucyApCiB7CmRpZmYgLS1naXQgYS9vbm1haW53aW5k b3cuaCBiL29ubWFpbndpbmRvdy5oCmluZGV4IGI1MWNhY2EuLjg5MDcwNGEgMTAwNjQ0Ci0tLSBh L29ubWFpbndpbmRvdy5oCisrKyBiL29ubWFpbndpbmRvdy5oCkBAIC00NCw2ICs0NCw3IEBACiAj aW5jbHVkZSAic3NobWFzdGVyY29ubmVjdGlvbi5oIgogCiAKKwogI2lmZGVmIFFfT1NfV0lOCiAj aW5jbHVkZSA8d2luZG93cy5oPgogI2VuZGlmCkBAIC01MjEsNiArNTIyLDcgQEAgcHVibGljOgog ICAgIH0KICNlbmRpZgogCisKIHByaXZhdGU6CiAgICAgUVN0cmluZyBtX3gyZ29jb25maWc7CiAg ICAgUVN0cmluZ0xpc3QgX2ludGVybkFwcGxpY2F0aW9uc05hbWVzOwpAQCAtODkxLDYgKzg5Myw3 IEBAIHByaXZhdGU6CiAgICAgdm9pZCByZW1vdmVBcHBzRnJvbVRyYXkoKTsKICAgICB2b2lkIHBs dWdBcHBzSW5UcmF5KCk7CiAgICAgUU1lbnUqIGluaXRUcmF5QXBwTWVudShRU3RyaW5nIHRleHQs IFFQaXhtYXAgaWNvbik7CisgICAgdm9pZCBzZXRUcmF5SWNvblRvU2Vzc2lvbkljb24oUVN0cmlu ZyBpbmZvKTsKIAogCiBwcm90ZWN0ZWQ6Ci0tIAoxLjcuMTAuNAoK --f46d04462eb62fe83d04dabaac7f--