/pidgin/main: 2e94b6fa06a0: Merged in CMaiku/pidgin (pull reques...
Gary Kramlich <[email protected]> Wed, 28 Sep 2016 10:32:40 -0400
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Q2hhbmdlc2V0OiAyZTk0YjZmYTA2YTBkOTQ5ZTA2NTViNGRiMmIwN2UzZWNhMjlmNDk2CkF1dGhv cjoJIEdhcnkgS3JhbWxpY2ggPGdyaW1AcmVhcGVyd29ybGQuY29tPgpEYXRlOgkgMjAxNi0wOS0y OCAwOTozMiAtMDUwMApCcmFuY2g6CSBkZWZhdWx0ClVSTDogaHR0cHM6Ly9oZy5waWRnaW4uaW0v cGlkZ2luL21haW4vcmV2LzJlOTRiNmZhMDZhMAoKRGVzY3JpcHRpb246CgpNZXJnZWQgaW4gQ01h aWt1L3BpZGdpbiAocHVsbCByZXF1ZXN0ICMxMzYpCgpXaW5kb3dzIGJ1aWxkIGZpeGVzCgpkaWZm c3RhdDoKCiBjb25maWd1cmUuYWMgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICA4ICsr KystLS0tCiBsaWJwdXJwbGUvcHJvdG9jb2xzL2JvbmpvdXIvTWFrZWZpbGUuYW0gIHwgICAzICsr LQogbGlicHVycGxlL3Byb3RvY29scy9mYWNlYm9vay9NYWtlZmlsZS5hbSB8ICAgMiArLQogbGli cHVycGxlL3Byb3RvY29scy9nZy9NYWtlZmlsZS5hbSAgICAgICB8ICAgMiArLQogcGlkZ2luL2xp YnBpZGdpbi5jICAgICAgICAgICAgICAgICAgICAgICB8ICAyNyArKysrKysrKysrKysrKysrKysr KysrKysrKy0KIDUgZmlsZXMgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMo LSkKCmRpZmZzICgyMjMgbGluZXMpOgoKZGlmZiAtLWdpdCBhL2NvbmZpZ3VyZS5hYyBiL2NvbmZp Z3VyZS5hYwotLS0gYS9jb25maWd1cmUuYWMKKysrIGIvY29uZmlndXJlLmFjCkBAIC0xNTUsOSAr MTU1LDkgQEAgQU1fQ09ORElUSU9OQUwoSVNfV0lOMzIsIHRlc3QgIngkaXNfd2luMwogQUNfU1VC U1QoW1BMVUdJTl9MREZMQUdTXSkKIAogZG5sIERlZmluZSAqX0xJQlMKLVBVUlBMRV9MSUJTPSJc JCh0b3BfYnVpbGRkaXIpL2xpYnB1cnBsZS9saWJwdXJwbGUubGEgXCQoR0xJQl9MSUJTKSIKLVBJ REdJTl9MSUJTPSJcJCh0b3BfYnVpbGRkaXIpL3BpZGdpbi9saWJwaWRnaW4ubGEgXCQoR1RLX0xJ QlMpIgotRklOQ0hfTElCUz0iXCQodG9wX2J1aWxkZGlyKS9maW5jaC9saWJmaW5jaC5sYSBcJCh0 b3BfYnVpbGRkaXIpL2ZpbmNoL2xpYmdudC9saWJnbnQubGEgXCQoR0xJQl9MSUJTKSIKK1BVUlBM RV9MSUJTPSJcJCh0b3BfYnVpbGRkaXIpL2xpYnB1cnBsZS9saWJwdXJwbGUubGEgXCQoR0xJQl9M SUJTKSBcJChHUExVR0lOX0xJQlMpIgorUElER0lOX0xJQlM9IlwkKHRvcF9idWlsZGRpcikvcGlk Z2luL2xpYnBpZGdpbi5sYSBcJChHVEtfTElCUykgXCQoUFVSUExFX0xJQlMpIFwkKFdFQktJVF9M SUJTKSIKK0ZJTkNIX0xJQlM9IlwkKHRvcF9idWlsZGRpcikvZmluY2gvbGliZmluY2gubGEgXCQo dG9wX2J1aWxkZGlyKS9maW5jaC9saWJnbnQvbGliZ250LmxhIFwkKFBVUlBMRV9MSUJTKSIKIEFD X1NVQlNUKFBVUlBMRV9MSUJTKQogQUNfU1VCU1QoUElER0lOX0xJQlMpCiBBQ19TVUJTVChGSU5D SF9MSUJTKQpAQCAtMTE5OCw3ICsxMTk4LDcgQEAgVGhlbiByZXJ1biB0aGlzIC4vY29uZmlndXJl CiAKIEZhbGxpbmcgYmFjayB0byB1c2luZyBvdXIgb3duIGNvcHkgb2YgbGliZ2FkdS4KIAkJXSkK LQldKQorCV0sIFskTElCR0FEVV9MSUJTXSkKIGZpCiAKIEFNX0NPTkRJVElPTkFMKEhBVkVfTElC R0FEVSwgdGVzdCAieCRoYXZlX2xpYmdhZHUiID0gInh5ZXMiKQpkaWZmIC0tZ2l0IGEvbGlicHVy cGxlL3Byb3RvY29scy9ib25qb3VyL01ha2VmaWxlLmFtIGIvbGlicHVycGxlL3Byb3RvY29scy9i b25qb3VyL01ha2VmaWxlLmFtCi0tLSBhL2xpYnB1cnBsZS9wcm90b2NvbHMvYm9uam91ci9NYWtl ZmlsZS5hbQorKysgYi9saWJwdXJwbGUvcHJvdG9jb2xzL2JvbmpvdXIvTWFrZWZpbGUuYW0KQEAg LTEsNSArMSw2IEBACiBFWFRSQV9ESVNUID0gXAogCW1kbnNfYXZhaGkuYyBcCisJbWRuc19kbnNf c2QuYyBcCiAJZG5zX3NkX3Byb3h5LmMgXAogCWRuc19zZF9wcm94eS5oIFwKIAlNYWtlZmlsZS5t aW5ndwpAQCAtMjMsNyArMjQsNyBAQCBCT05KT1VSU09VUkNFUyA9IFwKIAlib25qb3VyX2Z0Lmgg CiAKIGlmIElTX1dJTjMyCi1CT05KT1VSU09VUkNFUyArPSBkbnNfc2RfcHJveHkuYworQk9OSk9V UlNPVVJDRVMgKz0gZG5zX3NkX3Byb3h5LmMgbWRuc19kbnNfc2QuYwogZWxzZQogQk9OSk9VUlNP VVJDRVMgKz0gbWRuc19hdmFoaS5jCiBlbmRpZgpkaWZmIC0tZ2l0IGEvbGlicHVycGxlL3Byb3Rv Y29scy9mYWNlYm9vay9NYWtlZmlsZS5hbSBiL2xpYnB1cnBsZS9wcm90b2NvbHMvZmFjZWJvb2sv TWFrZWZpbGUuYW0KLS0tIGEvbGlicHVycGxlL3Byb3RvY29scy9mYWNlYm9vay9NYWtlZmlsZS5h bQorKysgYi9saWJwdXJwbGUvcHJvdG9jb2xzL2ZhY2Vib29rL01ha2VmaWxlLmFtCkBAIC01Miw3 ICs1Miw3IEBAIGVsc2UKIHN0ID0KIHBrZ19MVExJQlJBUklFUyAgICAgICAgPSBsaWJmYWNlYm9v ay5sYQogbGliZmFjZWJvb2tfbGFfU09VUkNFUyA9ICQoRkFDRUJPT0tTT1VSQ0VTKQotbGliZmFj ZWJvb2tfbGFfTElCQUREICA9IEBQVVJQTEVfTElCU0AKK2xpYmZhY2Vib29rX2xhX0xJQkFERCAg PSBAUFVSUExFX0xJQlNAICQoSlNPTl9MSUJTKQogCiBlbmRpZgogCmRpZmYgLS1naXQgYS9saWJw dXJwbGUvcHJvdG9jb2xzL2dnL01ha2VmaWxlLmFtIGIvbGlicHVycGxlL3Byb3RvY29scy9nZy9N YWtlZmlsZS5hbQotLS0gYS9saWJwdXJwbGUvcHJvdG9jb2xzL2dnL01ha2VmaWxlLmFtCisrKyBi L2xpYnB1cnBsZS9wcm90b2NvbHMvZ2cvTWFrZWZpbGUuYW0KQEAgLTEzMSw3ICsxMzEsNyBAQCBs aWJnZ19sYV9TT1VSQ0VTID0gJChHR1NPVVJDRVMpCiAKIGVuZGlmCiAKLWxpYmdnX2xhX0xJQkFE RCAgPSBAUFVSUExFX0xJQlNAICQoTElCR0FEVV9MSUJTKSAkKEpTT05fTElCUykKK2xpYmdnX2xh X0xJQkFERCAgPSBAUFVSUExFX0xJQlNAICQoTElCR0FEVV9MSUJTKSAkKElOVEdHX0xJQlMpICQo SlNPTl9MSUJTKQogCiBBTV9DUFBGTEFHUyA9IFwKIAktSSQodG9wX3NyY2RpcikvbGlicHVycGxl IFwKZGlmZiAtLWdpdCBhL3BpZGdpbi9saWJwaWRnaW4uYyBiL3BpZGdpbi9saWJwaWRnaW4uYwot LS0gYS9waWRnaW4vbGlicGlkZ2luLmMKKysrIGIvcGlkZ2luL2xpYnBpZGdpbi5jCkBAIC03MCwx MCArNzAsMTMgQEAKICNpbmNsdWRlICJwaWRnaW5zdG9jay5oIgogI2luY2x1ZGUgImd0a3doaXRl Ym9hcmQuaCIKIAorI2lmbmRlZiBfV0lOMzIKICNpbmNsdWRlIDxzaWduYWwuaD4KKyNlbmRpZgog CiAjaW5jbHVkZSA8Z2V0b3B0Lmg+CiAKKyNpZm5kZWYgX1dJTjMyCiAKIC8qCiAgKiBMaXN0cyBv ZiBzaWduYWxzIHdlIHdpc2ggdG8gY2F0Y2ggYW5kIHRob3NlIHdlIHdpc2ggdG8gaWdub3JlLgpA QCAtOTIsNiArOTUsNyBAQCBzdGF0aWMgY29uc3QgaW50IGlnbm9yZV9zaWdfbGlzdFtdID0gewog CVNJR1BJUEUsCiAJLTEKIH07CisjZW5kaWYgLyogIV9XSU4zMiAqLwogCiBzdGF0aWMgdm9pZAog ZG9sb2dpbl9uYW1lZChjb25zdCBjaGFyICpuYW1lKQpAQCAtMTIxLDYgKzEyNSw3IEBAIGRvbG9n aW5fbmFtZWQoY29uc3QgY2hhciAqbmFtZSkKIAl9CiB9CiAKKyNpZm5kZWYgX1dJTjMyCiBzdGF0 aWMgY2hhciAqc2VnZmF1bHRfbWVzc2FnZTsKIAogc3RhdGljIGludCBzaWduYWxfc29ja2V0c1sy XTsKQEAgLTE4OSw2ICsxOTQsNyBAQCBtYWlubG9vcF9zaWdoYW5kbGVyKEdJT0NoYW5uZWwgKnNv dXJjZSwgCiAKIAlyZXR1cm4gVFJVRTsKIH0KKyNlbmRpZiAvKiAhX1dJTjMyICovCiAKIHN0YXRp YyBpbnQKIHVpX21haW4odm9pZCkKQEAgLTQyNywyMSArNDMzLDIzIEBAIGludCBwaWRnaW5fc3Rh cnQoaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAlHdGtDc3NQcm92aWRlciAqcHJvdmlkZXI7CiAJ R2RrU2NyZWVuICpzY3JlZW47CiAJR0xpc3QgKmFjY291bnRzOworI2lmbmRlZiBfV0lOMzIKIAlp bnQgc2lnX2luZHg7CS8qIGZvciBzZXR0aW5nIHVwIHNpZ25hbCBjYXRjaGluZyAqLwogCXNpZ3Nl dF90IHNpZ3NldDsKIAljaGFyIGVycm1zZ1tCVUZTSVpdOwogCUdJT0NoYW5uZWwgKnNpZ25hbF9j aGFubmVsOwogCUdJT1N0YXR1cyBzaWduYWxfc3RhdHVzOwogCWd1aW50IHNpZ25hbF9jaGFubmVs X3dhdGNoZXI7Ci0JR0Vycm9yICplcnJvcjsKICNpZm5kZWYgREVCVUcKIAljaGFyICpzZWdmYXVs dF9tZXNzYWdlX3RtcDsKICNlbmRpZiAvKiBERUJVRyAqLworI2VuZGlmIC8qICFfV0lOMzIgKi8K IAlpbnQgb3B0OwogCWdib29sZWFuIGd1aV9jaGVjazsKIAlnYm9vbGVhbiBkZWJ1Z19lbmFibGVk LCBkZWJ1Z19jb2xvcmVkOwogCUdMaXN0ICphY3RpdmVfYWNjb3VudHM7CiAJR1N0YXRCdWYgc3Q7 CisJR0Vycm9yICplcnJvcjsKIAogCXN0cnVjdCBvcHRpb24gbG9uZ19vcHRpb25zW10gPSB7CiAJ CXsiY29uZmlnIiwgICAgICAgcmVxdWlyZWRfYXJndW1lbnQsIE5VTEwsICdjJ30sCkBAIC00NzQs NiArNDgyLDggQEAgaW50IHBpZGdpbl9zdGFydChpbnQgYXJnYywgY2hhciAqYXJndltdKQogCS8q IExvY2FsZSBpbml0aWFsaXphdGlvbiBpcyBub3QgY29tcGxldGUgaGVyZS4gIFNlZSBndGtfaW5p dF9jaGVjaygpICovCiAJc2V0bG9jYWxlKExDX0FMTCwgIiIpOwogCisjaWZuZGVmIF9XSU4zMgor CiAjaWZuZGVmIERFQlVHCiAJCS8qIFdlIHRyYW5zbGF0ZSB0aGlzIGhlcmUgaW4gY2FzZSB0aGUg Y3Jhc2ggYnJlYWtzIGdldHRleHQuICovCiAJCXNlZ2ZhdWx0X21lc3NhZ2VfdG1wID0gZ19zdHJk dXBfcHJpbnRmKF8oCkBAIC01NzQsNiArNTg0LDcgQEAgaW50IHBpZGdpbl9zdGFydChpbnQgYXJn YywgY2hhciAqYXJndltdKQogCQlzbnByaW50ZihlcnJtc2csIHNpemVvZihlcnJtc2cpLCAiV2Fy bmluZzogY291bGRuJ3QgdW5ibG9jayBzaWduYWxzIik7CiAJCXBlcnJvcihlcnJtc2cpOwogCX0K KyNlbmRpZiAvKiAhX1dJTjMyICovCiAKIAkvKiBzY2FuIGNvbW1hbmQtbGluZSBvcHRpb25zICov CiAJb3B0ZXJyID0gMTsKQEAgLTYyNiw3ICs2MzcsOSBAQCBpbnQgcGlkZ2luX3N0YXJ0KGludCBh cmdjLCBjaGFyICphcmd2W10pCiAJCWNhc2UgJz8nOgkvKiBzaG93IHRlcnNlIGhlbHAgKi8KIAkJ ZGVmYXVsdDoKIAkJCXNob3dfdXNhZ2UoYXJndlswXSwgVFJVRSk7CisjaWZuZGVmIF9XSU4zMgog CQkJZ19mcmVlKHNlZ2ZhdWx0X21lc3NhZ2UpOworI2VuZGlmCiAJCQlyZXR1cm4gMDsKIAkJCWJy ZWFrOwogCQl9CkBAIC02MzUsMTQgKzY0OCwxOCBAQCBpbnQgcGlkZ2luX3N0YXJ0KGludCBhcmdj LCBjaGFyICphcmd2W10pCiAJLyogc2hvdyBoZWxwIG1lc3NhZ2UgKi8KIAlpZiAob3B0X2hlbHAp IHsKIAkJc2hvd191c2FnZShhcmd2WzBdLCBGQUxTRSk7CisjaWZuZGVmIF9XSU4zMgogCQlnX2Zy ZWUoc2VnZmF1bHRfbWVzc2FnZSk7CisjZW5kaWYKIAkJcmV0dXJuIDA7CiAJfQogCS8qIHNob3cg dmVyc2lvbiBtZXNzYWdlICovCiAJaWYgKG9wdF92ZXJzaW9uKSB7CiAJCXByaW50ZigiJXMgJXMg KGxpYnB1cnBsZSAlcylcbiIsIFBJREdJTl9OQU1FLCBESVNQTEFZX1ZFUlNJT04sCiAJCSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHB1cnBsZV9jb3JlX2dldF92ZXJzaW9uKCkpOwor I2lmbmRlZiBfV0lOMzIKIAkJZ19mcmVlKHNlZ2ZhdWx0X21lc3NhZ2UpOworI2VuZGlmCiAJCXJl dHVybiAwOwogCX0KIApAQCAtNjc3LDcgKzY5NCw5IEBAIGludCBwaWRnaW5fc3RhcnQoaW50IGFy Z2MsIGNoYXIgKmFyZ3ZbXSkKIAkJcHJpbnRmKCIlcyAlc1xuIiwgUElER0lOX05BTUUsIERJU1BM QVlfVkVSU0lPTik7CiAKIAkJZ193YXJuaW5nKCJjYW5ub3Qgb3BlbiBkaXNwbGF5OiAlcyIsIGRp c3BsYXkgPyBkaXNwbGF5IDogInVuc2V0Iik7CisjaWZuZGVmIF9XSU4zMgogCQlnX2ZyZWUoc2Vn ZmF1bHRfbWVzc2FnZSk7CisjZW5kaWYKIAogCQlyZXR1cm4gMTsKIAl9CkBAIC03MTEsNyArNzMw LDkgQEAgaW50IHBpZGdpbl9zdGFydChpbnQgYXJnYywgY2hhciAqYXJndltdKQogCQlmcHJpbnRm KHN0ZGVyciwKIAkJCQkiSW5pdGlhbGl6YXRpb24gb2YgdGhlIGxpYnB1cnBsZSBjb3JlIGZhaWxl ZC4gRHVtcGluZyBjb3JlLlxuIgogCQkJCSJQbGVhc2UgcmVwb3J0IHRoaXMhXG4iKTsKKyNpZm5k ZWYgX1dJTjMyCiAJCWdfZnJlZShzZWdmYXVsdF9tZXNzYWdlKTsKKyNlbmRpZgogCQlhYm9ydCgp OwogCX0KIApAQCAtNzM3LDcgKzc1OCw5IEBAIGludCBwaWRnaW5fc3RhcnQoaW50IGFyZ2MsIGNo YXIgKmFyZ3ZbXSkKIAkJZ2RrX25vdGlmeV9zdGFydHVwX2NvbXBsZXRlKCk7CiAJCXB1cnBsZV9j b3JlX3F1aXQoKTsKIAkJZ19wcmludGVycihfKCJFeGl0aW5nIGJlY2F1c2UgYW5vdGhlciBsaWJw dXJwbGUgY2xpZW50IGlzIGFscmVhZHkgcnVubmluZy5cbiIpKTsKKyNpZm5kZWYgX1dJTjMyCiAJ CWdfZnJlZShzZWdmYXVsdF9tZXNzYWdlKTsKKyNlbmRpZgogCQlyZXR1cm4gMDsKIAl9CiAKQEAg LTgyMiwxMCArODQ1LDEyIEBAIGludCBwaWRnaW5fc3RhcnQoaW50IGFyZ2MsIGNoYXIgKmFyZ3Zb XSkKIAogCWd0a19tYWluKCk7CiAKKyNpZm5kZWYgX1dJTjMyCiAJZ19mcmVlKHNlZ2ZhdWx0X21l c3NhZ2UpOwogCWdfc291cmNlX3JlbW92ZShzaWduYWxfY2hhbm5lbF93YXRjaGVyKTsKIAljbG9z ZShzaWduYWxfc29ja2V0c1swXSk7CiAJY2xvc2Uoc2lnbmFsX3NvY2tldHNbMV0pOworI2VuZGlm CiAKICNpZmRlZiBfV0lOMzIKIAl3aW5waWRnaW5fY2xlYW51cCgpOwoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQ29tbWl0cyBtYWlsaW5nIGxpc3QKQ29t bWl0c0BwaWRnaW4uaW0KaHR0cHM6Ly9waWRnaW4uaW0vY2dpLWJpbi9tYWlsbWFuL2xpc3RpbmZv L2NvbW1pdHM=