From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29328 invoked by alias); 25 Jan 2002 16:28:15 -0000 Mailing-List: contact guile-gtk-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: guile-gtk-owner@sources.redhat.com Received: (qmail 29296 invoked from network); 25 Jan 2002 16:28:14 -0000 Received: from unknown (HELO hackedtobits.com) (64.152.176.2) by sources.redhat.com with SMTP; 25 Jan 2002 16:28:14 -0000 Received: (from apache@localhost) by hackedtobits.com (8.11.6/8.11.0) id g0PGSDG12729; Fri, 25 Jan 2002 11:28:13 -0500 Date: Fri, 25 Jan 2002 08:28:00 -0000 Message-Id: <200201251628.g0PGSDG12729@hackedtobits.com> From: "unknown_lamer" To: guile-gtk@sources.redhat.com Subject: Patches to make guile-gtk work with Guile 1.7 X-Mailer: Open WebMail 1.52 20011204 X-OriginatingIP: 151.196.172.117 (unknown_lamer) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=OPENWEBMAIL_ATT_0.150761674697609" X-SW-Source: 2002-q1/txt/msg00010.txt.bz2 This is a multi-part message in MIME format. ------=OPENWEBMAIL_ATT_0.150761674697609 Content-Type: text/plain; charset=iso-8859-1 Content-length: 782 Attached are patches to build-guile-gtk, guile-gtk.c, and guiledlopenhelper.c that make it work with guile 1.7 from guile's CVS HEAD. It still uses SCM_NEWCELL so it emits a warning when you exit guile (I don't know how to use scm_alloc_cell). I replaced SCM_LIST0 with SCM_UNSPECIFIED in build-guile-gtk, but I think it should be SCM_EOL instead (SCM_LIST0 made a 0-element list, correct? SCM_EOL becomes '() which is the same thing?). The only issue I've noticed is that sometimes it segfaults on load (a quick run through with gdb shows a lot of errors in rw_common), but other times it loads correctly. This might be because I'm compiling with GCC 3.0.3? -- + hackedtobits.com -- the home of irresponsible journalism http://lamer.hackedtobits.com -- the home of the lamer ------=OPENWEBMAIL_ATT_0.150761674697609 Content-Type: text/x-diff; name="build-guile-gtk.patch" Content-Transfer-Encoding: base64 Content-length: 2066 SW5kZXg6IGJ1aWxkLWd1aWxlLWd0awo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 ClJDUyBmaWxlOiAvY3ZzL2dub21lL2dub21lLWd1aWxlL2d1aWxlLWd0ay9i dWlsZC1ndWlsZS1ndGssdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNDAKZGlm ZiAtdSAtcjEuNDAgYnVpbGQtZ3VpbGUtZ3RrCi0tLSBidWlsZC1ndWlsZS1n dGsJMjAwMS8wNy8yNCAyMjo0ODo0MgkxLjQwCisrKyBidWlsZC1ndWlsZS1n dGsJMjAwMi8wMS8yNSAxNjoxMToyNwpAQCAtOTgwLDcgKzk4MCw3IEBACiAg ICAgICAoaWYgKG51bGw/IG11bHRpcGxlLXZhbHVlcykKIAkgIChAICJ+JSAg cmV0dXJuIH5hO34lfX4lfiUiICh0eXBlLWMyc2NtIHJ0eXBlICJjcl9yZXQi IHJjb3B5KSkKIAkgIChiZWdpbgotCSAgICAoQCAifiUgIHJldF9saXN0ID0g U0NNX0xJU1QwOyIpCisJICAgIChAICJ+JSAgcmV0X2xpc3QgPSBTQ01fVU5T UEVDSUZJRUQ7IikKIAkgICAgKGZvci1lYWNoIChsYW1iZGEgKHJldCkKIAkJ CShAICJ+JSAgcmV0X2xpc3QgPSBzY21fY29ucyh+YSwgcmV0X2xpc3QpOyIK IAkJCSAgICh0eXBlLWMyc2NtIChsb29rdXAtdHlwZSAoY2FyIHJldCkpCkBA IC0xMTM2LDkgKzExMzYsOSBAQAogICAgJ3N0cmluZyAKICAgIChtYWtlLXR5 cGUgInN0cmluZyIgImNoYXIqIgogCSAgICAgIChsYW1iZGEgKHgpIAotCQko QEAgIihTQ01fTklNUCh+YSkgJiYgU0NNX1JXU1RSSU5HUCh+YSkpIiB4IHgp KQorCQkoQEAgIihTQ01fTklNUCh+YSkgJiYgU0NNX1NUUklOR1AofmEpKSIg eCB4KSkKIAkgICAgICAobGFtYmRhICh4KSAKLQkJKEBAICIoKH5hKSA9PSBT Q01fQk9PTF9GPyBOVUxMIDogU0NNX0NIQVJTKH5hKSkiIHggeCkpCisJCShA QCAiKCh+YSkgPT0gU0NNX0JPT0xfRj8gTlVMTCA6IFNDTV9TVFJJTkdfQ0hB UlMofmEpKSIgeCB4KSkKIAkgICAgICAobGFtYmRhICh4IGNvcHkpIAogCQko QEAgIih+YSA9PSBOVUxMPyBTQ01fQk9PTF9GIDogc2NtX3Rha2Uwc3RyICh+ YSkpIiB4IHgpKQogCSAgICAgICdmaXQtZm9yLWxpc3QgI3QKQEAgLTExNDgs OSArMTE0OCw5IEBACiAgICAnY3N0cmluZyAKICAgIChtYWtlLXR5cGUgImNz dHJpbmciICJjb25zdCBjaGFyKiIKIAkgICAgICAobGFtYmRhICh4KSAKLQkJ KEBAICIoU0NNX05JTVAofmEpICYmIFNDTV9SV1NUUklOR1AofmEpKSIgeCB4 KSkKKwkJKEBAICIoU0NNX05JTVAofmEpICYmIFNDTV9TVFJJTkdQKH5hKSki IHggeCkpCiAJICAgICAgKGxhbWJkYSAoeCkgCi0JCShAQCAiKCh+YSkgPT0g U0NNX0JPT0xfRj8gTlVMTCA6IFNDTV9DSEFSUyh+YSkpIiB4IHgpKQorCQko QEAgIigofmEpID09IFNDTV9CT09MX0Y/IE5VTEwgOiBTQ01fU1RSSU5HX0NI QVJTKH5hKSkiIHggeCkpCiAJICAgICAgKGxhbWJkYSAoeCBjb3B5KSAKIAkJ KEBAICIofmEgPT0gTlVMTD8gU0NNX0JPT0xfRiA6IHNjbV90YWtlMHN0ciAo fmEpKSIgeCB4KSkKIAkgICAgICAnZml0LWZvci1saXN0ICN0Cg== ------=OPENWEBMAIL_ATT_0.150761674697609 Content-Type: text/x-diff; name="guile-gtk.c.patch" Content-Transfer-Encoding: base64 Content-length: 10586 SW5kZXg6IGd1aWxlLWd0ay5jCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNT IGZpbGU6IC9jdnMvZ25vbWUvZ25vbWUtZ3VpbGUvZ3VpbGUtZ3RrL2d1aWxl LWd0ay5jLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjY4CmRpZmYgLXUgLXIx LjY4IGd1aWxlLWd0ay5jCi0tLSBndWlsZS1ndGsuYwkyMDAxLzA2LzA0IDIy OjI3OjQyCTEuNjgKKysrIGd1aWxlLWd0ay5jCTIwMDIvMDEvMjUgMTY6MTQ6 MzAKQEAgLTY5LDYgKzY5LDEwIEBACiAjZGVmaW5lIHNjbV9yZXZlcnNlX3gg c2NtX2xpc3RfcmV2ZXJzZV94CiAjZW5kaWYKIAorI2lmbmRlZiBTQ01fTElT VDAKKyNkZWZpbmUgU0NNX0xJU1QwIFNDTV9FT0wKKyNlbmRpZiAKKwogDAog CiAvKiBBc3NvY2lhdGluZyBTQ00gdmFsdWVzIHdpdGggR3RrIHBvaW50ZXJz LgpAQCAtNTM0LDcgKzUzOCw3IEBACiAJICAgcHJveHktPm9iaiwgZ3RrX3R5 cGVfbmFtZSAoR1RLX09CSkVDVF9UWVBFIChwcm94eS0+b2JqKSkpOwogI2Vu ZGlmCiAKLSAgU0NNX1NFVEdDOE1BUksgKG9iaik7CisgIFNDTV9TRVRHQ01B UksgKG9iaik7CiAgIGlmIChHVEtfSVNfQ09OVEFJTkVSIChwcm94eS0+b2Jq KSkKICAgICBndGtfY29udGFpbmVyX2ZvcmVhY2ggKEdUS19DT05UQUlORVIo cHJveHktPm9iaiksIG1hcmtfdHJhY2VkX3JlZiwgTlVMTCk7CiAgIHNndGtf bWFya19wcm90ZWN0cyAocHJveHktPnByb3RlY3RzKTsKQEAgLTU1NSw3ICs1 NTksNyBAQAogICByZXR1cm4gMTsKIH0KIAotc3RhdGljIHNjbV9zaXpldAor c3RhdGljIHNpemVfdAogZ3Rrb2JqX2ZyZWUgKFNDTSBvYmopCiB7CiAgIHNn dGtfb2JqZWN0X3Byb3h5ICpwcm94eSA9IEdUS09CSl9QUk9YWSAob2JqKTsK QEAgLTYxOCw3ICs2MjIsNyBAQAogewogICBzZ3RrX29iamVjdF9wcm94eSAq cHJveHk7CiAKLSAgU0NNX1NFVEdDOE1BUksgKG9iaik7CisgIFNDTV9TRVRH Q01BUksgKG9iaik7CiAKICAgLyogV2UgZG8gdHdvIHBhc3NlcyBoZXJlLiAg VGhlIGZpcnN0IHBhc3MgY291bnRzIGhvdyBtYW55IHJlZmVyZW5jZXMKICAg ICAgYW4gb2JqZWN0IGhhcyBmcm9tIG90aGVyIG9iamVjdHMgdGhhdCBoYXZl IGEgcHJveHkuICBUaGUgc2Vjb25kCkBAIC0xMDA2LDcgKzEwMTAsNyBAQAog ICAgIHJldHVybiAwOwogCiAgIGZvciAoaSA9IDA7IGkgPCBpbmZvLT5uX2xp dGVyYWxzOyBpKyspCi0gICAgaWYgKCEgc3RyY21wIChpbmZvLT5saXRlcmFs c1tpXS5uYW1lLCBTQ01fQ0hBUlMgKG9iaikpKQorICAgIGlmICghIHN0cmNt cCAoaW5mby0+bGl0ZXJhbHNbaV0ubmFtZSwgU0NNX1NUUklOR19DSEFSUyAo b2JqKSkpCiAgICAgICByZXR1cm4gMTsKICAgcmV0dXJuIDA7CiB9CkBAIC0x MDI4LDEyICsxMDMyLDEyIEBACiAKICAgaWYgKFNDTV9TVFJJTkdQIChvYmop KQogICAgIHsKLSAgICAgIFNDTV9DT0VSQ0VfU1VCU1RSIChvYmopOwotICAg ICAgcmV0dXJuIFNDTV9DSEFSUyAob2JqKTsKKyAgICAgIFNDTV9TVFJJTkdf Q09FUkNFXzBURVJNSU5BVElPTl9YIChvYmopOworICAgICAgcmV0dXJuIFND TV9TVFJJTkdfQ0hBUlMgKG9iaik7CiAgICAgfQogCiAgIGZvciAoaSA9IDA7 IGkgPCBpbmZvLT5uX2xpdGVyYWxzOyBpKyspCi0gICAgaWYgKCEgc3RyY21w IChpbmZvLT5saXRlcmFsc1tpXS5uYW1lLCBTQ01fQ0hBUlMgKG9iaikpKQor ICAgIGlmICghIHN0cmNtcCAoaW5mby0+bGl0ZXJhbHNbaV0ubmFtZSwgU0NN X1NUUklOR19DSEFSUyAob2JqKSkpCiAgICAgICByZXR1cm4gaW5mby0+bGl0 ZXJhbHNbaV0udmFsdWU7CiAgIHJldHVybiBOVUxMOwogfQpAQCAtMTA0OSw3 ICsxMDUzLDcgQEAKICNkZWZpbmUgQk9YRURfUFRSKHgpICAgKChncG9pbnRl cilTQ01fQ0RSKHgpKQogI2RlZmluZSBCT1hFRF9JTkZPKHgpICAoKHNndGtf Ym94ZWRfaW5mbyopbXVzdF9nZXRfdHlwZV9pbmZvKEJPWEVEX1NFUU5PKHgp KSkKIAotc3RhdGljIHNjbV9zaXpldAorc3RhdGljIHNpemVfdAogYm94ZWRf ZnJlZSAoU0NNIG9iaikKIHsKICAgc2d0a19ib3hlZF9pbmZvICppbmZvID0g Qk9YRURfSU5GTyAob2JqKTsKQEAgLTEyMjYsNyArMTIzMCw3IEBACiBHZGtB dG9tCiBzZ3RrX3NjbTJhdG9tIChTQ00gc3ltYm9sKQogewotICByZXR1cm4g Z2RrX2F0b21faW50ZXJuIChTQ01fQ0hBUlMoc3ltYm9sKSwgRkFMU0UpOwor ICByZXR1cm4gZ2RrX2F0b21faW50ZXJuIChTQ01fU1RSSU5HX0NIQVJTKHN5 bWJvbCksIEZBTFNFKTsKIH0KIAogU0NNCkBAIC0xMzQ4LDcgKzEzNTIsNyBA QAogewogICByZXR1cm4gU0NNX0VRX1AgKG9iaiwgU0NNX0JPT0xfRikgfHwg R1RLVFlQRVAgKG9iaikKICAgICB8fCAoU0NNX05JTVAgKG9iaikgJiYgU0NN X1NZTUJPTFAgKG9iaikKLQkmJiBzZ3RrX3R5cGVfZnJvbV9uYW1lIChTQ01f Q0hBUlMgKG9iaikpKTsKKwkmJiBzZ3RrX3R5cGVfZnJvbV9uYW1lIChTQ01f U1RSSU5HX0NIQVJTIChvYmopKSk7CiB9CiAKIEd0a1R5cGUKQEAgLTEzNTks NyArMTM2Myw3IEBACiAgIGVsc2UgaWYgKEdUS1RZUEVQIChvYmopKQogICAg IHJldHVybiBHVEtUWVBFIChvYmopOwogICBlbHNlCi0gICAgcmV0dXJuIHNn dGtfdHlwZV9mcm9tX25hbWUgKFNDTV9DSEFSUyAob2JqKSk7CisgICAgcmV0 dXJuIHNndGtfdHlwZV9mcm9tX25hbWUgKFNDTV9TVFJJTkdfQ0hBUlMgKG9i aikpOwogfQogCiBTQ00KQEAgLTE0NTYsNyArMTQ2MCw3IEBACiAgICAgICBp bnQgaTsKICAgICAgIFNDTSAqZWx0czsKIAotICAgICAgYWN0dWFsX2xlbiA9 IFNDTV9MRU5HVEggKG9iaik7CisgICAgICBhY3R1YWxfbGVuID0gU0NNX1ZF Q1RPUl9MRU5HVEggKG9iaik7CiAgICAgICBpZiAobGVuID49IDAgJiYgbGVu ICE9IGFjdHVhbF9sZW4pCiAJcmV0dXJuIDA7CiAKQEAgLTE1MDcsNyArMTUx MSw3IEBACiAgICAgewogICAgICAgU0NNIHZlYyA9IG9iajsKICAgICAgIFND TSBuZXd2ZWMgPSB2ZWM7Ci0gICAgICBpbnQgbGVuID0gU0NNX0xFTkdUSChu ZXd2ZWMpLCBpOworICAgICAgaW50IGxlbiA9IFNDTV9WRUNUT1JfTEVOR1RI KG5ld3ZlYyksIGk7CiAgICAgICBmb3IgKGkgPSAwOyBpIDwgbGVuOyBpKysp CiAJewogCSAgU0NNIG5ld2VsdCA9IGNvbnZlcnNpb24gKFNDTV9WRUxUUyhu ZXd2ZWMpW2ldKTsKQEAgLTE1NDcsNyArMTU1MSw3IEBACiAgICAgfQogICBl bHNlIGlmIChTQ01fTklNUChvYmopICYmIFNDTV9WRUNUT1JQKG9iaikpCiAg ICAgewotICAgICAgaW50IGxlbiA9IFNDTV9MRU5HVEgob2JqKSwgaTsKKyAg ICAgIGludCBsZW4gPSBTQ01fVkVDVE9SX0xFTkdUSChvYmopLCBpOwogICAg ICAgZm9yIChpID0gMDsgaSA8IGxlbjsgaSsrKQogCVNDTV9WRUxUUyhvYmop W2ldID0gY29udmVyc2lvbiAoU0NNX1ZFTFRTKG9iailbaV0pOwogICAgICAg cmV0dXJuIG9iajsKQEAgLTE1OTIsNyArMTU5Niw3IEBACiAgICAgfQogICBl bHNlIGlmIChTQ01fTklNUChvYmopICYmIFNDTV9WRUNUT1JQKG9iaikpCiAg ICAgewotICAgICAgaW50IGxlbiA9IFNDTV9MRU5HVEggKG9iaiksIGk7Cisg ICAgICBpbnQgbGVuID0gU0NNX1ZFQ1RPUl9MRU5HVEggKG9iaiksIGk7CiAg ICAgICBTQ00gKmVsdHMgPSBTQ01fVkVMVFMgKG9iaik7CiAgICAgICBmb3Ig KGkgPSAwOyBpIDwgbGVuOyBpKyspCiAJewpAQCAtMTYyNyw3ICsxNjMxLDcg QEAKIAl9CiAgICAgICBlbHNlIGlmIChTQ01fTklNUChvYmopICYmIFNDTV9W RUNUT1JQKG9iaikpCiAJewotCSAgaW50IGxlbiA9IFNDTV9MRU5HVEggKG9i aiksIGk7CisJICBpbnQgbGVuID0gU0NNX1ZFQ1RPUl9MRU5HVEggKG9iaiks IGk7CiAJICBTQ00gKmVsdHMgPSBTQ01fVkVMVFMgKG9iaik7CiAJICBmb3Ig KGkgPSAwOyBpIDwgbGVuICYmIGxpc3Q7IGkrKykKIAkgICAgewpAQCAtMTY4 Miw3ICsxNjg2LDcgQEAKICAgICB9CiAgIGVsc2UgaWYgKFNDTV9OSU1QKG9i aikgJiYgU0NNX1ZFQ1RPUlAob2JqKSkKICAgICB7Ci0gICAgICBpbnQgbGVu ID0gU0NNX0xFTkdUSCAob2JqKSwgaTsKKyAgICAgIGludCBsZW4gPSBTQ01f VkVDVE9SX0xFTkdUSCAob2JqKSwgaTsKICAgICAgIFNDTSAqZWx0cyA9IFND TV9WRUxUUyAob2JqKTsKICAgICAgIGZvciAoaSA9IDA7IGkgPCBsZW47IGkr KykKIAl7CkBAIC0xNzIzLDcgKzE3MjcsNyBAQAogCX0KICAgICAgIGVsc2Ug aWYgKFNDTV9OSU1QKG9iaikgJiYgU0NNX1ZFQ1RPUlAob2JqKSkKIAl7Ci0J ICBpbnQgbGVuID0gU0NNX0xFTkdUSCAob2JqKSwgaTsKKwkgIGludCBsZW4g PSBTQ01fVkVDVE9SX0xFTkdUSCAob2JqKSwgaTsKIAkgIFNDTSAqZWx0cyA9 IFNDTV9WRUxUUyAob2JqKTsKIAkgIGZvciAoaSA9IDA7IGkgPCBsZW4gJiYg bGlzdDsgaSsrKQogCSAgICB7CkBAIC0xNzY1LDcgKzE3NjksNyBAQAogICBl bHNlIGlmIChTQ01fTklNUChvYmopICYmIFNDTV9WRUNUT1JQKG9iaikpCiAg ICAgewogICAgICAgU0NNICplbHRzID0gU0NNX1ZFTFRTIChvYmopOwotICAg ICAgcmVzLmNvdW50ID0gU0NNX0xFTkdUSCAob2JqKTsKKyAgICAgIHJlcy5j b3VudCA9IFNDTV9WRUNUT1JfTEVOR1RIIChvYmopOwogICAgICAgcmVzLnZl YyA9ICh2b2lkICopc2NtX211c3RfbWFsbG9jIChyZXMuY291bnQgKiBzeiwg InNjbTJjdmVjIik7CiAgICAgICBpZiAoZnJvbXNjbSkKIAl7CkBAIC0xODAy LDcgKzE4MDYsNyBAQAogICAgICAgZWxzZSBpZiAoU0NNX05JTVAob2JqKSAm JiBTQ01fVkVDVE9SUChvYmopKQogCXsKIAkgIFNDTSAqZWx0cyA9IFNDTV9W RUxUUyAob2JqKTsKLQkgIGludCBsZW4xID0gU0NNX0xFTkdUSCAob2JqKSwg bGVuMiA9IGN2ZWMtPmNvdW50LCBpOworCSAgaW50IGxlbjEgPSBTQ01fVkVD VE9SX0xFTkdUSCAob2JqKSwgbGVuMiA9IGN2ZWMtPmNvdW50LCBpOwogCSAg Y2hhciAqcHRyOwogCiAJICBmb3IgKGkgPSAwLCBwdHIgPSBjdmVjLT52ZWM7 IGkgPCBsZW4xICYmIGkgPCBsZW4yOyBpKyssIHB0ciArPSBzeikKQEAgLTE5 NTMsOCArMTk1Nyw4IEBACiAgICAgICBHVEtfVkFMVUVfRE9VQkxFKCphKSA9 IHNndGtfc2NtMmRvdWJsZSAob2JqKTsKICAgICAgIGJyZWFrOwogICAgIGNh c2UgR1RLX1RZUEVfU1RSSU5HOgotICAgICAgU0NNX0NPRVJDRV9TVUJTVFIg KG9iaik7Ci0gICAgICBHVEtfVkFMVUVfU1RSSU5HKCphKSA9IFNDTV9DSEFS UyhvYmopOworICAgICAgU0NNX1NUUklOR19DT0VSQ0VfMFRFUk1JTkFUSU9O X1ggKG9iaik7CisgICAgICBHVEtfVkFMVUVfU1RSSU5HKCphKSA9IFNDTV9T VFJJTkdfQ0hBUlMob2JqKTsKICAgICAgIGJyZWFrOwogICAgIGNhc2UgR1RL X1RZUEVfRU5VTToKICAgICAgIEdUS19WQUxVRV9FTlVNKCphKSA9CkBAIC0y MDIwLDggKzIwMjQsOCBAQAogICAgIGNhc2UgR1RLX1RZUEVfU1RSSU5HOgog ICAgICAgU0NNX0FTU0VSVCAoU0NNX05JTVAob2JqKSAmJiBTQ01fU1RSSU5H UChvYmopLCBvYmosIFNDTV9BUkcxLAogCQkgICJzY20tPmd0ayIpOwotICAg ICAgU0NNX0NPRVJDRV9TVUJTVFIgKG9iaik7Ci0gICAgICBHVEtfVkFMVUVf U1RSSU5HKCphKSA9IGdfc3RyZHVwIChTQ01fQ0hBUlMob2JqKSk7CisgICAg ICBTQ01fU1RSSU5HX0NPRVJDRV8wVEVSTUlOQVRJT05fWCAob2JqKTsKKyAg ICAgIEdUS19WQUxVRV9TVFJJTkcoKmEpID0gZ19zdHJkdXAgKFNDTV9TVFJJ TkdfQ0hBUlMob2JqKSk7CiAgICAgICBicmVhazsKICAgICBjYXNlIEdUS19U WVBFX0VOVU06CiAgICAgICAqR1RLX1JFVExPQ19FTlVNKCphKSA9CkBAIC0y MTMyLDcgKzIxMzYsNyBAQAogICBpbmZvLm5fYXJncyA9IG5fYXJnczsKICAg aW5mby5hcmdzID0gYXJnczsKIAotICBzY21faW50ZXJuYWxfY3dkciAoKHNj bV9jYXRjaF9ib2R5X3QpaW5uZXJfY2FsbGJhY2tfbWFyc2hhbCwgJmluZm8s CisgIHNjbV9pbnRlcm5hbF9jd2RyICgoc2NtX3RfY2F0Y2hfYm9keSlpbm5l cl9jYWxsYmFja19tYXJzaGFsLCAmaW5mbywKIAkJICAgICBzY21faGFuZGxl X2J5X21lc3NhZ2Vfbm9leGl0LCAiZ3RrIiwKIAkJICAgICAmc3RhY2tfaXRl bSk7CiB9CkBAIC0yMTU5LDkgKzIxNjMsOSBAQAogICAgICAgR2RrQ29sb3Ig Y29sc3RydWN0OwogICAgICAgR2RrQ29sb3JtYXAgKmNvbG1hcDsKIAotICAg ICAgU0NNX0NPRVJDRV9TVUJTVFIgKGNvbG9yKTsKKyAgICAgIFNDTV9TVFJJ TkdfQ09FUkNFXzBURVJNSU5BVElPTl9YIChjb2xvcik7CiAgICAgICBTQ01f REVGRVJfSU5UUzsKLSAgICAgIGlmICghZ2RrX2NvbG9yX3BhcnNlIChTQ01f Q0hBUlMgKGNvbG9yKSwgJmNvbHN0cnVjdCkpCisgICAgICBpZiAoIWdka19j b2xvcl9wYXJzZSAoU0NNX1NUUklOR19DSEFSUyAoY29sb3IpLCAmY29sc3Ry dWN0KSkKIAl7CiAJICBTQ01fQUxMT1dfSU5UUzsKIAkgIHNjbV9taXNjX2Vy cm9yICgic3RyaW5nLT5jb2xvciIsCkBAIC0yMTk5LDcgKzIyMDMsNyBAQAog CiAgIGlmIChTQ01fTklNUCAoZm9udCkgJiYgU0NNX1NUUklOR1AgKGZvbnQp KQogICAgIHsKLSAgICAgIFNDTV9DT0VSQ0VfU1VCU1RSIChmb250KTsKKyAg ICAgIFNDTV9TVFJJTkdfQ09FUkNFXzBURVJNSU5BVElPTl9YIChmb250KTsK ICAgICAgIGZvbnQgPSBzZ3RrX2dka19mb250X2xvYWQgKGZvbnQpOwogICAg ICAgaWYgKGZvbnQgPT0gU0NNX0JPT0xfRikKIAlzY21fbWlzY19lcnJvciAo InN0cmluZy0+Zm9udCIsCkBAIC0yMjE3LDcgKzIyMjEsNyBAQAogc2d0a19z dHJpbmdfY29udmVyc2lvbiAoU0NNIHN0cikKIHsKICAgaWYgKFNDTV9OSU1Q IChzdHIpICYmIFNDTV9TVFJJTkdQIChzdHIpKQotICAgIFNDTV9DT0VSQ0Vf U1VCU1RSIChzdHIpOworICAgIFNDTV9TVFJJTkdfQ09FUkNFXzBURVJNSU5B VElPTl9YIChzdHIpOwogICByZXR1cm4gc3RyOwogfQogCkBAIC0yNDEwLDkg KzI0MTQsOSBAQAogICAgICAgc2NtX2FyZ3MgPSBTQ01fQ0REUiAoc2NtX2Fy Z3MpOwogCiAgICAgICBpZiAoU0NNX05JTVAgKGt3KSAmJiBTQ01fU1lNQk9M UCAoa3cpKQotCW5hbWUgPSBTQ01fQ0hBUlMoa3cpOworCW5hbWUgPSBTQ01f U1RSSU5HX0NIQVJTKGt3KTsKICAgICAgIGVsc2UgaWYgKFNDTV9OSU1QIChr dykgJiYgU0NNX0tFWVdPUkRQIChrdykpCi0JbmFtZSA9IFNDTV9DSEFSUyhT Q01fS0VZV09SRFNZTShrdykpKzE7CisJbmFtZSA9IFNDTV9TVFJJTkdfQ0hB UlMoU0NNX0tFWVdPUkRTWU0oa3cpKSsxOwogICAgICAgZWxzZQogCXsKIAkg IGZwcmludGYgKHN0ZGVyciwgImJhZCBrZXl3b3JkXG4iKTsKQEAgLTI1MzUs OSArMjUzOSw5IEBACiAgIFNDTV9BU1NFUlQgKGluZm8gIT0gTlVMTCwgc2Nt X29iaiwgU0NNX0FSRzEsICJndGstb2JqZWN0LWdldCIpOwogCiAgIGlmIChT Q01fU1lNQk9MUChhcmdzeW0pKQotICAgIG5hbWUgPSBTQ01fQ0hBUlMoYXJn c3ltKTsKKyAgICBuYW1lID0gU0NNX1NUUklOR19DSEFSUyhhcmdzeW0pOwog ICBlbHNlCi0gICAgbmFtZSA9IFNDTV9DSEFSUyhTQ01fS0VZV09SRFNZTShh cmdzeW0pKSsxOworICAgIG5hbWUgPSBTQ01fU1RSSU5HX0NIQVJTKFNDTV9L RVlXT1JEU1lNKGFyZ3N5bSkpKzE7CiAgIHNndGtfZmluZF9hcmdfaW5mbyAo JmFyZywgaW5mbywgbmFtZSk7CiAKICAgU0NNX0RFRkVSX0lOVFM7CkBAIC0y ODM0LDcgKzI4MzgsNyBAQAogCSAgc2NtX211c3RfZnJlZSAoKGNoYXIgKil2 KTsKIAkgIHJldHVybjsKIAl9Ci0gICAgICB2W2ldID0geHN0cmR1cCAoU0NN X0NIQVJTIChTQ01fQ0FSIChsaXN0KSkpOworICAgICAgdltpXSA9IHhzdHJk dXAgKFNDTV9TVFJJTkdfQ0hBUlMgKFNDTV9DQVIgKGxpc3QpKSk7CiAgICAg fQogICB2W2NdID0gTlVMTDsKICAgCg== ------=OPENWEBMAIL_ATT_0.150761674697609 Content-Type: text/x-diff; name="guiledlopenhelper.c.patch" Content-Transfer-Encoding: base64 Content-length: 3160 SW5kZXg6IGd1aWxlZGxvcGVuaGVscGVyLmMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQpSQ1MgZmlsZTogL2N2cy9nbm9tZS9nbm9tZS1ndWlsZS9ndWlsZS1n dGsvZ3VpbGVkbG9wZW5oZWxwZXIuYyx2CnJldHJpZXZpbmcgcmV2aXNpb24g MS4xMApkaWZmIC11IC1yMS4xMCBndWlsZWRsb3BlbmhlbHBlci5jCi0tLSBn dWlsZWRsb3BlbmhlbHBlci5jCTIwMDEvMDUvMjEgMDI6MjU6NTIJMS4xMAor KysgZ3VpbGVkbG9wZW5oZWxwZXIuYwkyMDAyLzAxLzI1IDE2OjE1OjIzCkBA IC0zMSwxMSArMzEsMTEgQEAKIAogICBTQ01fQVNTRVJUIChTQ01fTklNUChu YW1lKSAmJiBTQ01fU1RSSU5HUChuYW1lKSwgbmFtZSwKIAkgICAgICBTQ01f QVJHMSwgIiVzZ3RrLWRsb3BlbiIpOwotICBTQ01fQ09FUkNFX1NVQlNUUiAo bmFtZSk7CisgIFNDTV9TVFJJTkdfQ09FUkNFXzBURVJNSU5BVElPTl9YIChu YW1lKTsKIAogICBTQ01fQVNTRVJUIChTQ01fTklNUChmdWxsbmFtZSkgJiYg U0NNX1NUUklOR1AoZnVsbG5hbWUpLCBmdWxsbmFtZSwKIAkgICAgICBTQ01f QVJHMiwgIiVzZ3RrLWRsb3BlbiIpOwotICBTQ01fQ09FUkNFX1NVQlNUUiAo ZnVsbG5hbWUpOworICBTQ01fU1RSSU5HX0NPRVJDRV8wVEVSTUlOQVRJT05f WCAoZnVsbG5hbWUpOwogCiAgIFNDTV9ERUZFUl9JTlRTOwogI2lmZGVmIEhB VkVfRExPUEVOCkBAIC01MiwxMiArNTIsMTIgQEAKICAgICovCiAjaWZkZWYg UlRMRF9HTE9CQUwKICNpZiAoZGVmaW5lZCBfX05ldEJTRF9fKQotICBoYW5k bGUgPSBkbG9wZW4gKFNDTV9DSEFSUyAoZnVsbG5hbWUpLCBSVExEX0xBWll8 UlRMRF9HTE9CQUwpOworICBoYW5kbGUgPSBkbG9wZW4gKFNDTV9TVFJJTkdf Q0hBUlMgKGZ1bGxuYW1lKSwgUlRMRF9MQVpZfFJUTERfR0xPQkFMKTsKICNl bHNlCi0gIGhhbmRsZSA9IGRsb3BlbiAoU0NNX0NIQVJTIChuYW1lKSwgUlRM RF9MQVpZfFJUTERfR0xPQkFMKTsKKyAgaGFuZGxlID0gZGxvcGVuIChTQ01f U1RSSU5HX0NIQVJTIChuYW1lKSwgUlRMRF9MQVpZfFJUTERfR0xPQkFMKTsK ICNlbmRpZgogI2Vsc2UKLSAgaGFuZGxlID0gZGxvcGVuIChTQ01fQ0hBUlMg KGZ1bGxuYW1lKSwgUlRMRF9MQVpZKTsKKyAgaGFuZGxlID0gZGxvcGVuIChT Q01fU1RSSU5HX0NIQVJTIChmdWxsbmFtZSksIFJUTERfTEFaWSk7CiAjZW5k aWYKICAgaWYgKGhhbmRsZSA9PSBOVUxMKQogICAgIGZwcmludGYgKHN0ZGVy ciwgImRsb3BlbjogJXNcbiIsIGRsZXJyb3IgKCkpOwpAQCAtNzcsMjUgKzc3 LDI1IEBACiAgIFNDTV9BU1NFUlQgKFNDTV9OSU1QKHN5bSkgJiYgU0NNX1NU UklOR1Aoc3ltKSwgc3ltLAogCSAgICAgIFNDTV9BUkcxLCAiJXNndGstZGxp bml0Iik7CiAgIGhhbmRsZSA9ICh2b2lkICopc2NtX251bTJ1bG9uZyAobGli LCAoY2hhciAqKVNDTV9BUkcyLCAiJXNndGstZGxpbml0Iik7Ci0gIFNDTV9D T0VSQ0VfU1VCU1RSIChzeW0pOworICBTQ01fU1RSSU5HX0NPRVJDRV8wVEVS TUlOQVRJT05fWCAoc3ltKTsKICAgCiAgIFNDTV9ERUZFUl9JTlRTOwogI2lm ZGVmIEhBVkVfRExPUEVOCiAjaWYgKGRlZmluZWQgX19OZXRCU0RfXykKICAg ZG8gewotICAgIGNoYXIgKnN5bWJvbCA9IHNjbV9tdXN0X21hbGxvYyAoc3Ry bGVuIChTQ01fQ0hBUlMgKHN5bSkpICsgMiwgImRsc3ltIik7CisgICAgY2hh ciAqc3ltYm9sID0gc2NtX211c3RfbWFsbG9jIChzdHJsZW4gKFNDTV9TVFJJ TkdfQ0hBUlMgKHN5bSkpICsgMiwgImRsc3ltIik7CiAKLSAgICBzcHJpbnRm IChzeW1ib2wsICJfJXMiLCBTQ01fQ0hBUlMgKHN5bSkpOworICAgIHNwcmlu dGYgKHN5bWJvbCwgIl8lcyIsIFNDTV9TVFJJTkdfQ0hBUlMgKHN5bSkpOwog ICAgIGZ1bmMgPSAodm9pZCAoKikoKSlkbHN5bSAoaGFuZGxlLCBzeW1ib2wp OwogICAgIHNjbV9tdXN0X2ZyZWUgKHN5bWJvbCk7CiAgIH0gd2hpbGUgKDAp OwogI2Vsc2UKLSAgZnVuYyA9ICh2b2lkICgqKSgpKWRsc3ltIChoYW5kbGUs IFNDTV9DSEFSUyAoc3ltKSk7CisgIGZ1bmMgPSAodm9pZCAoKikoKSlkbHN5 bSAoaGFuZGxlLCBTQ01fU1RSSU5HX0NIQVJTIChzeW0pKTsKICNlbmRpZgog ICBpZiAoZnVuYykKICAgICBmdW5jICgpOwogICBlbHNlCi0gICAgZnByaW50 ZiAoc3RkZXJyLCAiZGxzeW0gKCVzKTogJXNcbiIsIFNDTV9DSEFSUyAoc3lt KSwgZGxlcnJvciAoKSk7CisgICAgZnByaW50ZiAoc3RkZXJyLCAiZGxzeW0g KCVzKTogJXNcbiIsIFNDTV9TVFJJTkdfQ0hBUlMgKHN5bSksIGRsZXJyb3Ig KCkpOwogI2VuZGlmCiAgIFNDTV9BTExPV19JTlRTOwogICAK ------=OPENWEBMAIL_ATT_0.150761674697609--