/pidgin/main: 482a3b3e5c89: pidgin/plugins/gevolution: Remove MS...
Mike Ruprecht <[email protected]> Tue, 04 Oct 2016 14:37:58 -0400
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Q2hhbmdlc2V0OiA0ODJhM2IzZTVjODk3MjJkOGE0MGVkYjA2OTRmZjU4N2UyZWZkNGE2CkF1dGhv cjoJIE1pa2UgUnVwcmVjaHQgPGNtYWlrdUBnbWFpbC5jb20+CkRhdGU6CSAyMDE2LTA5LTMwIDE0 OjM4IC0wNTAwCkJyYW5jaDoJIHJlbGVhc2UtMi54LnkKVVJMOiBodHRwczovL2hnLnBpZGdpbi5p bS9waWRnaW4vbWFpbi9yZXYvNDgyYTNiM2U1Yzg5CgpEZXNjcmlwdGlvbjoKCnBpZGdpbi9wbHVn aW5zL2dldm9sdXRpb246IFJlbW92ZSBNU04gY29udGFjdCBoYW5kbGluZwoKZGlmZnN0YXQ6Cgog cGlkZ2luL3BsdWdpbnMvZ2V2b2x1dGlvbi9hZGRfYnVkZHlfZGlhbG9nLmMgIHwgIDE0ICsrKyst LS0tLS0tLS0tCiBwaWRnaW4vcGx1Z2lucy9nZXZvbHV0aW9uL2dldm8tdXRpbC5jICAgICAgICAg fCAgIDkgKy0tLS0tLS0tCiBwaWRnaW4vcGx1Z2lucy9nZXZvbHV0aW9uL2dldm9sdXRpb24uYyAg ICAgICAgfCAgIDEgLQogcGlkZ2luL3BsdWdpbnMvZ2V2b2x1dGlvbi9uZXdfcGVyc29uX2RpYWxv Zy5jIHwgICAyIC0tCiA0IGZpbGVzIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRp b25zKC0pCgpkaWZmcyAoMTE3IGxpbmVzKToKCmRpZmYgLS1naXQgYS9waWRnaW4vcGx1Z2lucy9n ZXZvbHV0aW9uL2FkZF9idWRkeV9kaWFsb2cuYyBiL3BpZGdpbi9wbHVnaW5zL2dldm9sdXRpb24v YWRkX2J1ZGR5X2RpYWxvZy5jCi0tLSBhL3BpZGdpbi9wbHVnaW5zL2dldm9sdXRpb24vYWRkX2J1 ZGR5X2RpYWxvZy5jCisrKyBiL3BpZGdpbi9wbHVnaW5zL2dldm9sdXRpb24vYWRkX2J1ZGR5X2Rp YWxvZy5jCkBAIC0yODgsMjEgKzI4OCwxOSBAQCBwb3B1bGF0ZV90cmVldmlldyhHZXZvQWRkQnVk ZHlEaWFsb2cgKmRpCiAJewogCQlFQ29udGFjdCAqY29udGFjdCA9IEVfQ09OVEFDVChjLT5kYXRh KTsKIAkJY29uc3QgY2hhciAqbmFtZTsKLQkJR0xpc3QgKmFpbXMsICpqYWJiZXJzLCAqeWFob29z LCAqbXNucywgKmljcXMsICpub3ZlbGxzLCAqZ2dzOworCQlHTGlzdCAqYWltcywgKmphYmJlcnMs ICp5YWhvb3MsICppY3FzLCAqbm92ZWxscywgKmdnczsKIAogCQluYW1lID0gZV9jb250YWN0X2dl dF9jb25zdChjb250YWN0LCBFX0NPTlRBQ1RfRlVMTF9OQU1FKTsKIAogCQlhaW1zICAgID0gZV9j b250YWN0X2dldChjb250YWN0LCBFX0NPTlRBQ1RfSU1fQUlNKTsKIAkJamFiYmVycyA9IGVfY29u dGFjdF9nZXQoY29udGFjdCwgRV9DT05UQUNUX0lNX0pBQkJFUik7CiAJCXlhaG9vcyAgPSBlX2Nv bnRhY3RfZ2V0KGNvbnRhY3QsIEVfQ09OVEFDVF9JTV9ZQUhPTyk7Ci0JCW1zbnMgICAgPSBlX2Nv bnRhY3RfZ2V0KGNvbnRhY3QsIEVfQ09OVEFDVF9JTV9NU04pOwogCQlpY3FzICAgID0gZV9jb250 YWN0X2dldChjb250YWN0LCBFX0NPTlRBQ1RfSU1fSUNRKTsKIAkJbm92ZWxscyA9IGVfY29udGFj dF9nZXQoY29udGFjdCwgRV9DT05UQUNUX0lNX0dST1VQV0lTRSk7CiAJCWdncyAgICAgPSBlX2Nv bnRhY3RfZ2V0KGNvbnRhY3QsIEVfQ09OVEFDVF9JTV9HQURVR0FEVSk7CiAKIAkJaWYgKGFpbXMg PT0gTlVMTCAmJiBqYWJiZXJzID09IE5VTEwgJiYgeWFob29zID09IE5VTEwgJiYKLQkJCW1zbnMg PT0gTlVMTCAmJiBpY3FzID09IE5VTEwgJiYgbm92ZWxscyA9PSBOVUxMICYmCi0JCQlnZ3MgPT0g TlVMTCkKKwkJCWljcXMgPT0gTlVMTCAmJiBub3ZlbGxzID09IE5VTEwgJiYgZ2dzID09IE5VTEwp CiAJCXsKIAkJCUd0a1RyZWVJdGVyIGl0ZXI7CiAKQEAgLTMxOCw3ICszMTYsNiBAQCBwb3B1bGF0 ZV90cmVldmlldyhHZXZvQWRkQnVkZHlEaWFsb2cgKmRpCiAJCQlhZGRfaW1zKGRpYWxvZywgY29u dGFjdCwgbmFtZSwgYWltcywgICAgInBycGwtYWltIik7CiAJCQlhZGRfaW1zKGRpYWxvZywgY29u dGFjdCwgbmFtZSwgamFiYmVycywgInBycGwtamFiYmVyIik7CiAJCQlhZGRfaW1zKGRpYWxvZywg Y29udGFjdCwgbmFtZSwgeWFob29zLCAgInBycGwteWFob28iKTsKLQkJCWFkZF9pbXMoZGlhbG9n LCBjb250YWN0LCBuYW1lLCBtc25zLCAgICAicHJwbC1tc24iKTsKIAkJCWFkZF9pbXMoZGlhbG9n LCBjb250YWN0LCBuYW1lLCBpY3FzLCAgICAicHJwbC1pY3EiKTsKIAkJCWFkZF9pbXMoZGlhbG9n LCBjb250YWN0LCBuYW1lLCBub3ZlbGxzLCAicHJwbC1ub3ZlbGwiKTsKIAkJCWFkZF9pbXMoZGlh bG9nLCBjb250YWN0LCBuYW1lLCBnZ3MsICAgICAicHJwbC1nZyIpOwpAQCAtMzY3LDcgKzM2NCw3 IEBAIHNlYXJjaF9jaGFuZ2VkX2NiKEd0a0VudHJ5ICplbnRyeSwgR2V2b0EKIAl7CiAJCUVDb250 YWN0ICpjb250YWN0ID0gRV9DT05UQUNUKGwtPmRhdGEpOwogCQljb25zdCBjaGFyICpuYW1lOwot CQlHTGlzdCAqYWltcywgKmphYmJlcnMsICp5YWhvb3MsICptc25zLCAqaWNxcywgKm5vdmVsbHMs ICpnZ3M7CisJCUdMaXN0ICphaW1zLCAqamFiYmVycywgKnlhaG9vcywgKmljcXMsICpub3ZlbGxz LCAqZ2dzOwogCiAJCW5hbWUgPSBlX2NvbnRhY3RfZ2V0X2NvbnN0KGNvbnRhY3QsIEVfQ09OVEFD VF9GVUxMX05BTUUpOwogCkBAIC0zODAsMTQgKzM3NywxMiBAQCBzZWFyY2hfY2hhbmdlZF9jYihH dGtFbnRyeSAqZW50cnksIEdldm9BCiAJCWFpbXMgICAgPSBlX2NvbnRhY3RfZ2V0KGNvbnRhY3Qs IEVfQ09OVEFDVF9JTV9BSU0pOwogCQlqYWJiZXJzID0gZV9jb250YWN0X2dldChjb250YWN0LCBF X0NPTlRBQ1RfSU1fSkFCQkVSKTsKIAkJeWFob29zICA9IGVfY29udGFjdF9nZXQoY29udGFjdCwg RV9DT05UQUNUX0lNX1lBSE9PKTsKLQkJbXNucyAgICA9IGVfY29udGFjdF9nZXQoY29udGFjdCwg RV9DT05UQUNUX0lNX01TTik7CiAJCWljcXMgICAgPSBlX2NvbnRhY3RfZ2V0KGNvbnRhY3QsIEVf Q09OVEFDVF9JTV9JQ1EpOwogCQlub3ZlbGxzID0gZV9jb250YWN0X2dldChjb250YWN0LCBFX0NP TlRBQ1RfSU1fR1JPVVBXSVNFKTsKIAkJZ2dzICAgICA9IGVfY29udGFjdF9nZXQoY29udGFjdCwg RV9DT05UQUNUX0lNX0dBRFVHQURVKTsKIAogCQlpZiAoYWltcyA9PSBOVUxMICYmIGphYmJlcnMg PT0gTlVMTCAmJiB5YWhvb3MgPT0gTlVMTCAmJgotCQkJbXNucyA9PSBOVUxMICYmIGljcXMgPT0g TlVMTCAmJiBub3ZlbGxzID09IE5VTEwgJiYKLQkJCWdncyA9PSBOVUxMKQorCQkJaWNxcyA9PSBO VUxMICYmIG5vdmVsbHMgPT0gTlVMTCAmJiBnZ3MgPT0gTlVMTCkKIAkJewogCQkJR3RrVHJlZUl0 ZXIgaXRlcjsKIApAQCAtNDAzLDcgKzM5OCw2IEBAIHNlYXJjaF9jaGFuZ2VkX2NiKEd0a0VudHJ5 ICplbnRyeSwgR2V2b0EKIAkJCWFkZF9pbXMoZGlhbG9nLCBjb250YWN0LCBuYW1lLCBhaW1zLCAg ICAicHJwbC1haW0iKTsKIAkJCWFkZF9pbXMoZGlhbG9nLCBjb250YWN0LCBuYW1lLCBqYWJiZXJz LCAicHJwbC1qYWJiZXIiKTsKIAkJCWFkZF9pbXMoZGlhbG9nLCBjb250YWN0LCBuYW1lLCB5YWhv b3MsICAicHJwbC15YWhvbyIpOwotCQkJYWRkX2ltcyhkaWFsb2csIGNvbnRhY3QsIG5hbWUsIG1z bnMsICAgICJwcnBsLW1zbiIpOwogCQkJYWRkX2ltcyhkaWFsb2csIGNvbnRhY3QsIG5hbWUsIGlj cXMsICAgICJwcnBsLWljcSIpOwogCQkJYWRkX2ltcyhkaWFsb2csIGNvbnRhY3QsIG5hbWUsIG5v dmVsbHMsICJwcnBsLW5vdmVsbCIpOwogCQkJYWRkX2ltcyhkaWFsb2csIGNvbnRhY3QsIG5hbWUs IGdncywgICAgICJwcnBsLWdnIik7CmRpZmYgLS1naXQgYS9waWRnaW4vcGx1Z2lucy9nZXZvbHV0 aW9uL2dldm8tdXRpbC5jIGIvcGlkZ2luL3BsdWdpbnMvZ2V2b2x1dGlvbi9nZXZvLXV0aWwuYwot LS0gYS9waWRnaW4vcGx1Z2lucy9nZXZvbHV0aW9uL2dldm8tdXRpbC5jCisrKyBiL3BpZGdpbi9w bHVnaW5zL2dldm9sdXRpb24vZ2V2by11dGlsLmMKQEAgLTEwMyw4ICsxMDMsNiBAQCBnZXZvX3By cGxfZ2V0X2ZpZWxkKFB1cnBsZUFjY291bnQgKmFjY291CiAJCXByb3RvY29sX2ZpZWxkID0gRV9D T05UQUNUX0lNX0FJTTsKIAllbHNlIGlmICghc3RyY21wKHByb3RvY29sX2lkLCAicHJwbC1pY3Ei KSkKIAkJcHJvdG9jb2xfZmllbGQgPSBFX0NPTlRBQ1RfSU1fSUNROwotCWVsc2UgaWYgKCFzdHJj bXAocHJvdG9jb2xfaWQsICJwcnBsLW1zbiIpKQotCQlwcm90b2NvbF9maWVsZCA9IEVfQ09OVEFD VF9JTV9NU047CiAJZWxzZSBpZiAoIXN0cmNtcChwcm90b2NvbF9pZCwgInBycGwteWFob28iKSkK IAkJcHJvdG9jb2xfZmllbGQgPSBFX0NPTlRBQ1RfSU1fWUFIT087CiAJZWxzZSBpZiAoIXN0cmNt cChwcm90b2NvbF9pZCwgInBycGwtamFiYmVyIikpCkBAIC0xNzAsMTIgKzE2OCw3IEBAIGdldm9f Z2V0X2VtYWlsX2Zvcl9idWRkeShQdXJwbGVCdWRkeSAqYnUKIAkJUHVycGxlQWNjb3VudCAqYWNj b3VudCA9IHB1cnBsZV9idWRkeV9nZXRfYWNjb3VudChidWRkeSk7CiAJCWNvbnN0IGNoYXIgKnBy cGxfaWQgPSBwdXJwbGVfYWNjb3VudF9nZXRfcHJvdG9jb2xfaWQoYWNjb3VudCk7CiAKLQkJaWYg KCFzdHJjbXAocHJwbF9pZCwgInBycGwtbXNuIikpCi0JCXsKLQkJCW1haWwgPSBnX3N0cmR1cChw dXJwbGVfbm9ybWFsaXplKGFjY291bnQsCi0JCQkJCQkJCQkJICAgcHVycGxlX2J1ZGR5X2dldF9u YW1lKGJ1ZGR5KSkpOwotCQl9Ci0JCWVsc2UgaWYgKCFzdHJjbXAocHJwbF9pZCwgInBycGwteWFo b28iKSkKKwkJaWYgKCFzdHJjbXAocHJwbF9pZCwgInBycGwteWFob28iKSkKIAkJewogCQkJbWFp bCA9IGdfc3RyZHVwX3ByaW50ZigiJXNAeWFob28uY29tIiwKIAkJCQkJCQkJICAgcHVycGxlX25v cm1hbGl6ZShhY2NvdW50LApkaWZmIC0tZ2l0IGEvcGlkZ2luL3BsdWdpbnMvZ2V2b2x1dGlvbi9n ZXZvbHV0aW9uLmMgYi9waWRnaW4vcGx1Z2lucy9nZXZvbHV0aW9uL2dldm9sdXRpb24uYwotLS0g YS9waWRnaW4vcGx1Z2lucy9nZXZvbHV0aW9uL2dldm9sdXRpb24uYworKysgYi9waWRnaW4vcGx1 Z2lucy9nZXZvbHV0aW9uL2dldm9sdXRpb24uYwpAQCAtMTIyLDcgKzEyMiw2IEBAIHVwZGF0ZV9i dWRkaWVzX2Zyb21fY29udGFjdChFQ29udGFjdCAqY28KIAl1cGRhdGVfaW1zX2Zyb21fY29udGFj dChjb250YWN0LCBuYW1lLCAicHJwbC1haW0iLCAgICBFX0NPTlRBQ1RfSU1fQUlNKTsKIAl1cGRh dGVfaW1zX2Zyb21fY29udGFjdChjb250YWN0LCBuYW1lLCAicHJwbC1qYWJiZXIiLCBFX0NPTlRB Q1RfSU1fSkFCQkVSKTsKIAl1cGRhdGVfaW1zX2Zyb21fY29udGFjdChjb250YWN0LCBuYW1lLCAi cHJwbC15YWhvbyIsICBFX0NPTlRBQ1RfSU1fWUFIT08pOwotCXVwZGF0ZV9pbXNfZnJvbV9jb250 YWN0KGNvbnRhY3QsIG5hbWUsICJwcnBsLW1zbiIsICAgIEVfQ09OVEFDVF9JTV9NU04pOwogCXVw ZGF0ZV9pbXNfZnJvbV9jb250YWN0KGNvbnRhY3QsIG5hbWUsICJwcnBsLWljcSIsICAgIEVfQ09O VEFDVF9JTV9JQ1EpOwogCXVwZGF0ZV9pbXNfZnJvbV9jb250YWN0KGNvbnRhY3QsIG5hbWUsICJw cnBsLW5vdmVsbCIsIEVfQ09OVEFDVF9JTV9HUk9VUFdJU0UpOwogCXVwZGF0ZV9pbXNfZnJvbV9j b250YWN0KGNvbnRhY3QsIG5hbWUsICJwcnBsLWdnIiwgICAgIEVfQ09OVEFDVF9JTV9HQURVR0FE VSk7CmRpZmYgLS1naXQgYS9waWRnaW4vcGx1Z2lucy9nZXZvbHV0aW9uL25ld19wZXJzb25fZGlh bG9nLmMgYi9waWRnaW4vcGx1Z2lucy9nZXZvbHV0aW9uL25ld19wZXJzb25fZGlhbG9nLmMKLS0t IGEvcGlkZ2luL3BsdWdpbnMvZ2V2b2x1dGlvbi9uZXdfcGVyc29uX2RpYWxvZy5jCisrKyBiL3Bp ZGdpbi9wbHVnaW5zL2dldm9sdXRpb24vbmV3X3BlcnNvbl9kaWFsb2cuYwpAQCAtMTQ5LDggKzE0 OSw2IEBAIGFkZF9jYihHdGtXaWRnZXQgKncsIEdldm9OZXdQZXJzb25EaWFsb2cKIAkJCWZpZWxk ID0gRV9DT05UQUNUX0lNX1lBSE9POwogCQllbHNlIGlmICghc3RyY21wKGltX3NlcnZpY2UsICJw cnBsLWphYmJlciIpKQogCQkJZmllbGQgPSBFX0NPTlRBQ1RfSU1fSkFCQkVSOwotCQllbHNlIGlm ICghc3RyY21wKGltX3NlcnZpY2UsICJwcnBsLW1zbiIpKQotCQkJZmllbGQgPSBFX0NPTlRBQ1Rf SU1fTVNOOwogCQllbHNlIGlmICghc3RyY21wKGltX3NlcnZpY2UsICJwcnBsLW5vdmVsbCIpKQog CQkJZmllbGQgPSBFX0NPTlRBQ1RfSU1fR1JPVVBXSVNFOwogCQllbHNlIGlmICghc3RyY21wKGlt X3NlcnZpY2UsICJwcnBsLWdnIikpCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpDb21taXRzIG1haWxpbmcgbGlzdApDb21taXRzQHBpZGdpbi5pbQpodHRw czovL3BpZGdpbi5pbS9jZ2ktYmluL21haWxtYW4vbGlzdGluZm8vY29tbWl0cw==