/pidgin/main: 63975292a852: Remove comment and docstring mention...
Mike Ruprecht <[email protected]> Tue, 04 Oct 2016 14:37:59 -0400
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Q2hhbmdlc2V0OiA2Mzk3NTI5MmE4NTI2NDMxOTNjMTM3NjI3NjRkMDc4N2FmNjE0YWUxCkF1dGhv cjoJIE1pa2UgUnVwcmVjaHQgPGNtYWlrdUBnbWFpbC5jb20+CkRhdGU6CSAyMDE2LTEwLTA0IDEz OjAzIC0wNTAwCkJyYW5jaDoJIHJlbGVhc2UtMi54LnkKVVJMOiBodHRwczovL2hnLnBpZGdpbi5p bS9waWRnaW4vbWFpbi9yZXYvNjM5NzUyOTJhODUyCgpEZXNjcmlwdGlvbjoKClJlbW92ZSBjb21t ZW50IGFuZCBkb2NzdHJpbmcgbWVudGlvbnMgb2YgTVNOCgpkaWZmc3RhdDoKCiBsaWJwdXJwbGUv YWNjb3VudC5oICAgICAgICAgICAgICAgICAgfCAgMiArLQogbGlicHVycGxlL2JsaXN0LmggICAg ICAgICAgICAgICAgICAgIHwgIDIgKy0KIGxpYnB1cnBsZS9jbWRzLmggICAgICAgICAgICAgICAg ICAgICB8ICAyICstCiBsaWJwdXJwbGUvY29udmVyc2F0aW9uLmMgICAgICAgICAgICAgfCAgMiAr LQogbGlicHVycGxlL2NvbnZlcnNhdGlvbi5oICAgICAgICAgICAgIHwgIDUgKystLS0KIGxpYnB1 cnBsZS9wcm90b2NvbHMvamFiYmVyL2xpYnhtcHAuYyB8ICA1ICsrKy0tCiBsaWJwdXJwbGUvcHJw bC5oICAgICAgICAgICAgICAgICAgICAgfCAgNCArKy0tCiBsaWJwdXJwbGUvc2VydmVyLmggICAg ICAgICAgICAgICAgICAgfCAgMiArLQogcGlkZ2luL2d0a2JsaXN0LmMgICAgICAgICAgICAgICAg ICAgIHwgIDggKysrLS0tLS0KIDkgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTcg ZGVsZXRpb25zKC0pCgpkaWZmcyAoMTQwIGxpbmVzKToKCmRpZmYgLS1naXQgYS9saWJwdXJwbGUv YWNjb3VudC5oIGIvbGlicHVycGxlL2FjY291bnQuaAotLS0gYS9saWJwdXJwbGUvYWNjb3VudC5o CisrKyBiL2xpYnB1cnBsZS9hY2NvdW50LmgKQEAgLTE5Miw3ICsxOTIsNyBAQCBzdHJ1Y3QgX1B1 cnBsZUFjY291bnQKIAkvKgogCSAqIFRPRE86IFN1cHBsZW1lbnRpbmcgdGhlIG5leHQgdHdvIGxp bmtlZCBsaXN0cyB3aXRoIGhhc2ggdGFibGVzCiAJICogc2hvdWxkIGhlbHAgcGVyZm9ybWFuY2Ug YSBsb3Qgd2hlbiB0aGVzZSBsaXN0cyBhcmUgbG9uZy4gIFRoaXMKLQkgKiBtYXR0ZXJzIHF1aXRl IGEgYml0IGZvciBwcm90b2NvbHMgbGlrZSBNU04sIHdoZXJlIGFsbCB5b3VyCisJICogbWF0dGVy cyBxdWl0ZSBhIGJpdCBmb3IgcHJvdG9jb2xzLCB3aGVyZSBhbGwgeW91cgogCSAqIGJ1ZGRpZXMg YXJlIGFkZGVkIHRvIHlvdXIgcGVybWl0IGxpc3QuICBDdXJyZW50bHkgd2UgaGF2ZSB0bwogCSAq IGl0ZXJhdGUgdGhyb3VnaCB0aGUgZW50aXJlIGxpc3QgaWYgd2Ugd2FudCB0byBjaGVjayBpZiBz b21lb25lCiAJICogaXMgcGVybWl0dGVkIG9yIGRlbmllZC4gIFdlIHNob3VsZCBkbyB0aGlzIGZv ciAzLjAuMC4KZGlmZiAtLWdpdCBhL2xpYnB1cnBsZS9ibGlzdC5oIGIvbGlicHVycGxlL2JsaXN0 LmgKLS0tIGEvbGlicHVycGxlL2JsaXN0LmgKKysrIGIvbGlicHVycGxlL2JsaXN0LmgKQEAgLTEz OSw3ICsxMzksNyBAQCBzdHJ1Y3QgX1B1cnBsZUJ1ZGR5IHsKIAlQdXJwbGVCbGlzdE5vZGUgbm9k ZTsgICAgICAgICAgICAgICAgICAgICAvKio8IFRoZSBub2RlIHRoYXQgdGhpcyBidWRkeSBpbmhl cml0cyBmcm9tICovCiAJY2hhciAqbmFtZTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8q KjwgVGhlIG5hbWUgb2YgdGhlIGJ1ZGR5LiAqLwogCWNoYXIgKmFsaWFzOyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAvKio8IFRoZSB1c2VyLXNldCBhbGlhcyBvZiB0aGUgYnVkZHkgKi8KLQlj aGFyICpzZXJ2ZXJfYWxpYXM7ICAgICAgICAgICAgICAgICAgICAgLyoqPCBUaGUgc2VydmVyLXNw ZWNpZmllZCBhbGlhcyBvZiB0aGUgYnVkZHkuICAoaS5lLiBNU04gIkZyaWVuZGx5IE5hbWVzIikg Ki8KKwljaGFyICpzZXJ2ZXJfYWxpYXM7ICAgICAgICAgICAgICAgICAgICAgLyoqPCBUaGUgc2Vy dmVyLXNwZWNpZmllZCBhbGlhcyBvZiB0aGUgYnVkZHkgKi8KIAl2b2lkICpwcm90b19kYXRhOyAg ICAgICAgICAgICAgICAgICAgICAgLyoqPCBUaGlzIGFsbG93cyB0aGUgcHJwbCB0byBhc3NvY2lh dGUgd2hhdGV2ZXIgZGF0YSBpdCB3YW50cyB3aXRoIGEgYnVkZHkgKi8KIAlQdXJwbGVCdWRkeUlj b24gKmljb247ICAgICAgICAgICAgICAgICAgICAvKio8IFRoZSBidWRkeSBpY29uLiAqLwogCVB1 cnBsZUFjY291bnQgKmFjY291bnQ7CQkJCQkvKio8IHRoZSBhY2NvdW50IHRoaXMgYnVkZHkgYmVs b25ncyB0byAqLwpkaWZmIC0tZ2l0IGEvbGlicHVycGxlL2NtZHMuaCBiL2xpYnB1cnBsZS9jbWRz LmgKLS0tIGEvbGlicHVycGxlL2NtZHMuaAorKysgYi9saWJwdXJwbGUvY21kcy5oCkBAIC0xNzAs NyArMTcwLDcgQEAgZXh0ZXJuICJDIiB7CiAgKiAgICAgICAgICBvcmRlciBmb3IgdGhlIGNvbW1h bmQgdG8gZXZlciBhY3R1YWxseSBiZSBjYWxsZWQuCiAgKiBAcGFyYW0gcHJwbF9pZCBJZiB0aGUg I1BVUlBMRV9DTURfRkxBR19QUlBMX09OTFkgZmxhZyBpcyBzZXQsIHRoaXMgaXMgdGhlIGlkCiAg KiAgICAgICAgICAgICAgICBvZiB0aGUgcHJwbCB0byB3aGljaCB0aGUgY29tbWFuZCBhcHBsaWVz IChzdWNoIGFzCi0gKiAgICAgICAgICAgICAgICA8dHQ+InBycGwtbXNuIjwvdHQ+KS4gSWYgdGhl IGZsYWcgaXMgbm90IHNldCwgdGhpcyBwYXJhbWV0ZXIKKyAqICAgICAgICAgICAgICAgIDx0dD4i cHJwbC1haW0iPC90dD4pLiBJZiB0aGUgZmxhZyBpcyBub3Qgc2V0LCB0aGlzIHBhcmFtZXRlcgog ICogICAgICAgICAgICAgICAgaXMgaWdub3JlZDsgcGFzcyBAYyBOVUxMIChvciBhIGh1bW91cm91 cyBzdHJpbmcgb2YgeW91cgogICogICAgICAgICAgICAgICAgY2hvaWNlISkuCiAgKiBAcGFyYW0g ZnVuYyBUaGlzIGlzIHRoZSBmdW5jdGlvbiB0byBjYWxsIHdoZW4gc29tZW9uZSBlbnRlcnMgdGhp cyBjb21tYW5kLgpkaWZmIC0tZ2l0IGEvbGlicHVycGxlL2NvbnZlcnNhdGlvbi5jIGIvbGlicHVy cGxlL2NvbnZlcnNhdGlvbi5jCi0tLSBhL2xpYnB1cnBsZS9jb252ZXJzYXRpb24uYworKysgYi9s aWJwdXJwbGUvY29udmVyc2F0aW9uLmMKQEAgLTM1MSw3ICszNTEsNyBAQCBwdXJwbGVfY29udmVy c2F0aW9uX25ldyhQdXJwbGVDb252ZXJzYXRpCiAJCX0KIAogCQkvKgotCQkgKiBUaGlzIGhhY2sg aXMgbmVjZXNzYXJ5IGJlY2F1c2Ugc29tZSBwcnBscyAoTVNOKSBoYXZlIHVubmFtZWQgY2hhdHMK KwkJICogVGhpcyBoYWNrIGlzIG5lY2Vzc2FyeSBiZWNhdXNlIHNvbWUgcHJwbHMgaGF2ZSB1bm5h bWVkIGNoYXRzCiAJCSAqIHRoYXQgYWxsIHVzZSB0aGUgc2FtZSBuYW1lLiAgQSBQdXJwbGVDb252 ZXJzYXRpb24gZm9yIG9uZSBvZiB0aG9zZQogCQkgKiBpcyBvbmx5IGV2ZXIgcmUtdXNlZCBpZiB0 aGUgdXNlciBoYXMgbGVmdCwgc28gY2FsbHMgdG8KIAkJICogcHVycGxlX2NvbnZlcnNhdGlvbl9u ZXcgbmVlZCB0byBmYWxsLXRocm91Z2ggdG8gY3JlYXRpbmcgYSBuZXcKZGlmZiAtLWdpdCBhL2xp YnB1cnBsZS9jb252ZXJzYXRpb24uaCBiL2xpYnB1cnBsZS9jb252ZXJzYXRpb24uaAotLS0gYS9s aWJwdXJwbGUvY29udmVyc2F0aW9uLmgKKysrIGIvbGlicHVycGxlL2NvbnZlcnNhdGlvbi5oCkBA IC04ODQsOSArODg0LDggQEAgZ3VpbnQgcHVycGxlX2NvbnZfaW1fZ2V0X3R5cGluZ190aW1lb3V0 KAogCiAvKioKICAqIFNldHMgdGhlIHF1aWV0LXRpbWUgd2hlbiBubyBQVVJQTEVfVFlQSU5HIG1l c3NhZ2VzIHdpbGwgYmUgc2VudC4KLSAqIEZldyBwcm90b2NvbHMgbmVlZCB0aGlzIChtYXliZSBv bmx5IE1TTikuICBJZiB0aGUgdXNlciBpcyBzdGlsbAotICogdHlwaW5nIGFmdGVyIHRoaXMgcXVp ZXQtcGVyaW9kLCB0aGVuIGFub3RoZXIgUFVSUExFX1RZUElORyBtZXNzYWdlCi0gKiB3aWxsIGJl IHNlbnQuCisgKiBGZXcgcHJvdG9jb2xzIG5lZWQgdGhpcy4gIElmIHRoZSB1c2VyIGlzIHN0aWxs IHR5cGluZyBhZnRlciB0aGlzCisgKiBxdWlldC1wZXJpb2QsIHRoZW4gYW5vdGhlciBQVVJQTEVf VFlQSU5HIG1lc3NhZ2Ugd2lsbCBiZSBzZW50LgogICoKICAqIEBwYXJhbSBpbSAgVGhlIElNLgog ICogQHBhcmFtIHZhbCBUaGUgbnVtYmVyIG9mIHNlY29uZHMgdG8gd2FpdCBiZWZvcmUgYWxsb3dp bmcgYW5vdGhlcgpkaWZmIC0tZ2l0IGEvbGlicHVycGxlL3Byb3RvY29scy9qYWJiZXIvbGlieG1w cC5jIGIvbGlicHVycGxlL3Byb3RvY29scy9qYWJiZXIvbGlieG1wcC5jCi0tLSBhL2xpYnB1cnBs ZS9wcm90b2NvbHMvamFiYmVyL2xpYnhtcHAuYworKysgYi9saWJwdXJwbGUvcHJvdG9jb2xzL2ph YmJlci9saWJ4bXBwLmMKQEAgLTMxNSw4ICszMTUsOSBAQCBpbml0X3BsdWdpbihQdXJwbGVQbHVn aW4gKnBsdWdpbikKIAlwcnBsX2luZm8ucHJvdG9jb2xfb3B0aW9ucyA9IGdfbGlzdF9hcHBlbmQo cHJwbF9pbmZvLnByb3RvY29sX29wdGlvbnMsCiAJCQkJCQkgIG9wdGlvbik7CiAKLQkvKiB0aGlz IHNob3VsZCBwcm9iYWJseSBiZSBwYXJ0IG9mIGdsb2JhbCBzbWlsZXkgdGhlbWUgc2V0dGluZ3Mg bGF0ZXIgb24sCi0JICBzaGFyZWQgd2l0aCBNU04gKi8KKwkvKiB0aGlzIHNob3VsZCBwcm9iYWJs eSBiZSBwYXJ0IG9mIGdsb2JhbCBzbWlsZXkgdGhlbWUgc2V0dGluZ3MKKwkgKiBsYXRlciBvbgor CSAqLwogCW9wdGlvbiA9IHB1cnBsZV9hY2NvdW50X29wdGlvbl9ib29sX25ldyhfKCJTaG93IEN1 c3RvbSBTbWlsZXlzIiksCiAJCSJjdXN0b21fc21pbGV5cyIsIFRSVUUpOwogCXBycGxfaW5mby5w cm90b2NvbF9vcHRpb25zID0gZ19saXN0X2FwcGVuZChwcnBsX2luZm8ucHJvdG9jb2xfb3B0aW9u cywKZGlmZiAtLWdpdCBhL2xpYnB1cnBsZS9wcnBsLmggYi9saWJwdXJwbGUvcHJwbC5oCi0tLSBh L2xpYnB1cnBsZS9wcnBsLmgKKysrIGIvbGlicHVycGxlL3BycGwuaApAQCAtMTYyLDcgKzE2Miw3 IEBAIHR5cGVkZWYgZW51bQogCS8qKgogCSAqIE5vdGlmeSBvbiBuZXcgbWFpbC4KIAkgKgotCSAq IE1TTiBhbmQgWWFob28gbm90aWZ5IHlvdSB3aGVuIHlvdSBoYXZlIG5ldyBtYWlsLgorCSAqIFlh aG9vIG5vdGlmaWVzIHlvdSB3aGVuIHlvdSBoYXZlIG5ldyBtYWlsLgogCSAqLwogCU9QVF9QUk9U T19NQUlMX0NIRUNLID0gMHgwMDAwMDAyMCwKIApAQCAtOTIyLDcgKzkyMiw3IEBAIEdMaXN0ICpw dXJwbGVfcHJwbF9nZXRfc3RhdHVzZXMoUHVycGxlQWMKICAqIEBwYXJhbSB3aG8gV2hvc2UgYXR0 ZW50aW9uIHRvIHJlcXVlc3QuCiAgKiBAcGFyYW0gdHlwZV9jb2RlIEFuIGluZGV4IGludG8gdGhl IHBycGwncyBhdHRlbnRpb25fdHlwZXMgbGlzdCBkZXRlcm1pbmluZyB0aGUgdHlwZQogICogICAg ICAgIG9mIHRoZSBhdHRlbnRpb24gcmVxdWVzdCBjb21tYW5kIHRvIHNlbmQuIDAgaWYgcHJwbCBv bmx5IGRlZmluZXMgb25lCi0gKiAgICAgICAgKGZvciBleGFtcGxlLCBZYWhvbyBhbmQgTVNOKSwg YnV0IHNvbWUgcHJvdG9jb2xzIGRlZmluZSBtb3JlIChNeVNwYWNlSU0pLgorICogICAgICAgIChm b3IgZXhhbXBsZSwgWWFob28pLCBidXQgc29tZSBwcm90b2NvbHMgZGVmaW5lIG1vcmUgKE15U3Bh Y2VJTSkuCiAgKgogICogTm90ZSB0aGF0IHlvdSBjYW4ndCBzZW5kIGFyYml0cmFyeSBQdXJwbGVB dHRlbnRpb25UeXBlJ3MsIGJlY2F1c2UgdGhlcmUgaXMKICAqIG9ubHkgYSBmaXhlZCBzZXQgb2Yg YXR0ZW50aW9uIGNvbW1hbmRzLgpkaWZmIC0tZ2l0IGEvbGlicHVycGxlL3NlcnZlci5oIGIvbGli cHVycGxlL3NlcnZlci5oCi0tLSBhL2xpYnB1cnBsZS9zZXJ2ZXIuaAorKysgYi9saWJwdXJwbGUv c2VydmVyLmgKQEAgLTY5LDcgKzY5LDcgQEAgUHVycGxlQXR0ZW50aW9uVHlwZSAqcHVycGxlX2dl dF9hdHRlbnRpbwogICogQHBhcmFtIHdobyBXaG9zZSBhdHRlbnRpb24gdG8gcmVxdWVzdC4KICAq IEBwYXJhbSB0eXBlX2NvZGUgQW4gaW5kZXggaW50byB0aGUgcHJwbCdzIGF0dGVudGlvbl90eXBl cyBsaXN0IGRldGVybWluaW5nIHRoZSB0eXBlCiAgKiAJb2YgdGhlIGF0dGVudGlvbiByZXF1ZXN0 IGNvbW1hbmQgdG8gc2VuZC4gMCBpZiBwcnBsIG9ubHkgZGVmaW5lcyBvbmUKLSAqIAkoZm9yIGV4 YW1wbGUsIFlhaG9vIGFuZCBNU04pLCBidXQgc29tZSBwcm90b2NvbHMgZGVmaW5lIG1vcmUgKE15 U3BhY2VJTSkuCisgKiAJKGZvciBleGFtcGxlLCBZYWhvbyksIGJ1dCBzb21lIHByb3RvY29scyBk ZWZpbmUgbW9yZSAoTXlTcGFjZUlNKS4KICAqCiAgKiBOb3RlIHRoYXQgeW91IGNhbid0IHNlbmQg YXJiaXRyYXJ5IFB1cnBsZUF0dGVudGlvblR5cGUncywgYmVjYXVzZSB0aGVyZSBpcwogICogb25s eSBhIGZpeGVkIHNldCBvZiBhdHRlbnRpb24gY29tbWFuZHMuCmRpZmYgLS1naXQgYS9waWRnaW4v Z3RrYmxpc3QuYyBiL3BpZGdpbi9ndGtibGlzdC5jCi0tLSBhL3BpZGdpbi9ndGtibGlzdC5jCisr KyBiL3BpZGdpbi9ndGtibGlzdC5jCkBAIC0zNzkxLDcgKzM3OTEsNyBAQCBzdGF0aWMgY2hhciAq cGlkZ2luX2dldF90b29sdGlwX3RleHQoUHVyCiAKIAkJLyogTmlja25hbWUvU2VydmVyIEFsaWFz ICovCiAJCS8qIEknZCBsaWtlIHRvIG9ubHkgc2hvdyB0aGlzIGlmIHRoZXJlJ3MgYSBjb250YWN0 IG9yIGJ1ZGR5Ci0JCSAqIGFsaWFzLCBidXQgbWFueSBwZW9wbGUgb24gTVNOIHNldCBsb25nIG5p Y2tuYW1lcywgd2hpY2gKKwkJICogYWxpYXMsIGJ1dCBwZW9wbGUgb2Z0ZW4gc2V0IGxvbmcgbmlj a25hbWVzLCB3aGljaAogCQkgKiBnZXQgZWxsaXBzaXplZCwgc28gdGhlIG9ubHkgd2F5IHRvIHNl ZSB0aGUgd2hvbGUgdGhpbmcgaXMKIAkJICogdG8gbG9vayBhdCB0aGUgdG9vbHRpcC4gKi8KIAkJ aWYgKGZ1bGwgJiYgYi0+c2VydmVyX2FsaWFzICE9IE5VTEwgJiYgYi0+c2VydmVyX2FsaWFzWzBd ICE9ICdcMCcpCkBAIC00MDE3LDE0ICs0MDE3LDEyIEBAIHBpZGdpbl9ibGlzdF9nZXRfZW1ibGVt KFB1cnBsZUJsaXN0Tm9kZSAKIAogCXR1bmUgPSBwdXJwbGVfcHJlc2VuY2VfZ2V0X3N0YXR1cyhw LCAidHVuZSIpOwogCWlmICh0dW5lICYmIHB1cnBsZV9zdGF0dXNfaXNfYWN0aXZlKHR1bmUpKSB7 Ci0JCS8qIE9ubHkgaW4gTVNOLgotCQkgKiBUT0RPOiBSZXBsYWNlICJUdW5lIiB3aXRoIGdlbmVy YWxpemVkICJNZWRpYSIgaW4gMy4wLiAqLworCQkvKiBUT0RPOiBSZXBsYWNlICJUdW5lIiB3aXRo IGdlbmVyYWxpemVkICJNZWRpYSIgaW4gMy4wLiAqLwogCQlpZiAocHVycGxlX3N0YXR1c19nZXRf YXR0cl9zdHJpbmcodHVuZSwgImdhbWUiKSAhPSBOVUxMKSB7CiAJCQlwYXRoID0gZ19idWlsZF9m aWxlbmFtZShEQVRBRElSLCAicGl4bWFwcyIsICJwaWRnaW4iLCAiZW1ibGVtcyIsICIxNiIsICJn YW1lLnBuZyIsIE5VTEwpOwogCQkJcmV0dXJuIF9waWRnaW5fYmxpc3RfZ2V0X2NhY2hlZF9lbWJs ZW0ocGF0aCk7CiAJCX0KLQkJLyogT25seSBpbiBNU04uCi0JCSAqIFRPRE86IFJlcGxhY2UgIlR1 bmUiIHdpdGggZ2VuZXJhbGl6ZWQgIk1lZGlhIiBpbiAzLjAuICovCisJCS8qIFRPRE86IFJlcGxh Y2UgIlR1bmUiIHdpdGggZ2VuZXJhbGl6ZWQgIk1lZGlhIiBpbiAzLjAuICovCiAJCWlmIChwdXJw bGVfc3RhdHVzX2dldF9hdHRyX3N0cmluZyh0dW5lLCAib2ZmaWNlIikgIT0gTlVMTCkgewogCQkJ cGF0aCA9IGdfYnVpbGRfZmlsZW5hbWUoREFUQURJUiwgInBpeG1hcHMiLCAicGlkZ2luIiwgImVt YmxlbXMiLCAiMTYiLCAib2ZmaWNlLnBuZyIsIE5VTEwpOwogCQkJcmV0dXJuIF9waWRnaW5fYmxp c3RfZ2V0X2NhY2hlZF9lbWJsZW0ocGF0aCk7CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpDb21taXRzIG1haWxpbmcgbGlzdApDb21taXRzQHBpZGdpbi5p bQpodHRwczovL3BpZGdpbi5pbS9jZ2ktYmluL21haWxtYW4vbGlzdGluZm8vY29tbWl0cw==