/pidgin/main: d4cd494a36a5: libsecret-keyring: Factor out GError...
Mike Ruprecht <[email protected]> Wed, 19 Oct 2016 14:50:57 -0400
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Q2hhbmdlc2V0OiBkNGNkNDk0YTM2YTVmMDQxZjgwODc3MzY3Njc3YjE5MTVmNzFiYzVhCkF1dGhv cjoJIE1pa2UgUnVwcmVjaHQgPGNtYWlrdUBnbWFpbC5jb20+CkRhdGU6CSAyMDE2LTA5LTE1IDA4 OjM2IC0wNTAwCkJyYW5jaDoJIGRlZmF1bHQKVVJMOiBodHRwczovL2hnLnBpZGdpbi5pbS9waWRn aW4vbWFpbi9yZXYvZDRjZDQ5NGEzNmE1CgpEZXNjcmlwdGlvbjoKCmxpYnNlY3JldC1rZXlyaW5n OiBGYWN0b3Igb3V0IEdFcnJvciBoYW5kbGluZyBpbnRvIGl0cyBvd24gZnVuY3Rpb24KClRoaXMg cGF0Y2ggZmFjdG9ycyBvdXQgdGhlIEdFcnJvciBoYW5kbGluZyBjb2RlLCB3aGljaCB3YXMgZHVw bGljYXRlZAppbiBib3RoIGFzeW5jIGNhbGxiYWNrcywgaW50byBpdHMgb3duIGZ1bmN0aW9uLiBJ dCBhbHNvIGNoYW5nZXMgaXQgdG8KdXNlIGdfZXJyb3JfbWF0Y2hlcygpLCB3aGljaCBhbHNvIGNo ZWNrcyB0aGUgZXJyb3IgZG9tYWluIGluc3RlYWQgb2YKb25seSBjaGVja2luZyB0aGUgZXJyb3Ig Y29kZS4KCmRpZmZzdGF0OgoKIGxpYnB1cnBsZS9wbHVnaW5zL2tleXJpbmdzL3NlY3JldHNlcnZp Y2UuYyB8ICAxMzMgKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlcyBjaGFuZ2Vk LCA1MyBpbnNlcnRpb25zKCspLCA4MCBkZWxldGlvbnMoLSkKCmRpZmZzICgxNjkgbGluZXMpOgoK ZGlmZiAtLWdpdCBhL2xpYnB1cnBsZS9wbHVnaW5zL2tleXJpbmdzL3NlY3JldHNlcnZpY2UuYyBi L2xpYnB1cnBsZS9wbHVnaW5zL2tleXJpbmdzL3NlY3JldHNlcnZpY2UuYwotLS0gYS9saWJwdXJw bGUvcGx1Z2lucy9rZXlyaW5ncy9zZWNyZXRzZXJ2aWNlLmMKKysrIGIvbGlicHVycGxlL3BsdWdp bnMva2V5cmluZ3Mvc2VjcmV0c2VydmljZS5jCkBAIC03Niw2ICs3Niw0OCBAQCBzdHJ1Y3QgX0lu Zm9TdG9yYWdlCiAvKiAgICAgS2V5cmluZyBpbnRlcmZhY2UgICAgICAgICAgICAgICAgICAgICAg ICovCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBz dGF0aWMgdm9pZAorc3NfZ19lcnJvcl90b19rZXlyaW5nX2Vycm9yKEdFcnJvciAqKmVycm9yLCBQ dXJwbGVBY2NvdW50ICphY2NvdW50KQoreworCUdFcnJvciAqb2xkX2Vycm9yOworCUdFcnJvciAq bmV3X2Vycm9yID0gTlVMTDsKKworCWdfcmV0dXJuX2lmX2ZhaWwoZXJyb3IgIT0gTlVMTCk7CisK KwlvbGRfZXJyb3IgPSAqZXJyb3I7CisKKwlpZiAoZ19lcnJvcl9tYXRjaGVzKG9sZF9lcnJvciwg R19EQlVTX0VSUk9SLAorCQkJCUdfREJVU19FUlJPUl9TUEFXTl9TRVJWSUNFX05PVF9GT1VORCkg fHwKKwkJCWdfZXJyb3JfbWF0Y2hlcyhvbGRfZXJyb3IsIEdfREJVU19FUlJPUiwKKwkJCQlHX0RC VVNfRVJST1JfSU9fRVJST1IpKSB7CisJCXB1cnBsZV9kZWJ1Z19pbmZvKCJrZXlyaW5nLWxpYnNl Y3JldCIsCisJCQkiRmFpbGVkIHRvIGNvbW11bmljYXRlIHdpdGggU2VjcmV0ICIKKwkJCSJTZXJ2 aWNlIChhY2NvdW50OiAlcyAoJXMpKS5cbiIsCisJCQlwdXJwbGVfYWNjb3VudF9nZXRfdXNlcm5h bWUoYWNjb3VudCksCisJCQlwdXJwbGVfYWNjb3VudF9nZXRfcHJvdG9jb2xfaWQoYWNjb3VudCkp OworCQluZXdfZXJyb3IgPSBnX2Vycm9yX25ldyhQVVJQTEVfS0VZUklOR19FUlJPUiwKKwkJCVBV UlBMRV9LRVlSSU5HX0VSUk9SX0JBQ0tFTkRGQUlMLAorCQkJIkZhaWxlZCB0byBjb21tdW5pY2F0 ZSB3aXRoIFNlY3JldCAiCisJCQkiU2VydmljZSAoYWNjb3VudDogJXMpLiIsCisJCQlwdXJwbGVf YWNjb3VudF9nZXRfdXNlcm5hbWUoYWNjb3VudCkpOworCX0gZWxzZSB7CisJCXB1cnBsZV9kZWJ1 Z19lcnJvcigia2V5cmluZy1saWJzZWNyZXQiLAorCQkJIlVua25vd24gZXJyb3IgKGFjY291bnQ6 ICVzICglcyksICIKKwkJCSJkb21haW46ICVzLCBjb2RlOiAlZCk6ICVzLlxuIiwKKwkJCXB1cnBs ZV9hY2NvdW50X2dldF91c2VybmFtZShhY2NvdW50KSwKKwkJCXB1cnBsZV9hY2NvdW50X2dldF9w cm90b2NvbF9pZChhY2NvdW50KSwKKwkJCWdfcXVhcmtfdG9fc3RyaW5nKG9sZF9lcnJvci0+ZG9t YWluKSwKKwkJCQlvbGRfZXJyb3ItPmNvZGUsIG9sZF9lcnJvci0+bWVzc2FnZSk7CisJCW5ld19l cnJvciA9IGdfZXJyb3JfbmV3KFBVUlBMRV9LRVlSSU5HX0VSUk9SLAorCQkJUFVSUExFX0tFWVJJ TkdfRVJST1JfQkFDS0VOREZBSUwsCisJCQkiVW5rbm93biBlcnJvciAoYWNjb3VudDogJXMpLiIs CisJCQlwdXJwbGVfYWNjb3VudF9nZXRfdXNlcm5hbWUoYWNjb3VudCkpOworCX0KKworCWdfY2xl YXJfZXJyb3IoZXJyb3IpOworCWdfcHJvcGFnYXRlX2Vycm9yKGVycm9yLCBuZXdfZXJyb3IpOwor fQorCitzdGF0aWMgdm9pZAogc3NfcmVhZF9jb250aW51ZShHT2JqZWN0ICpvYmplY3QsIEdBc3lu Y1Jlc3VsdCAqcmVzdWx0LCBncG9pbnRlciBkYXRhKQogewogCUluZm9TdG9yYWdlICpzdG9yYWdl ID0gZGF0YTsKQEAgLTg3LDUzICsxMjksMTkgQEAgc3NfcmVhZF9jb250aW51ZShHT2JqZWN0ICpv YmplY3QsIEdBc3luYwogCXBhc3N3b3JkID0gc2VjcmV0X3Bhc3N3b3JkX2xvb2t1cF9maW5pc2go cmVzdWx0LCAmZXJyb3IpOwogCiAJaWYgKGVycm9yICE9IE5VTEwpIHsKLQkJaW50IGNvZGUgPSBl cnJvci0+Y29kZTsKLQotCQlzd2l0Y2ggKGNvZGUpIHsKLQkJCWNhc2UgR19EQlVTX0VSUk9SX1NQ QVdOX1NFUlZJQ0VfTk9UX0ZPVU5EOgotCQkJY2FzZSBHX0RCVVNfRVJST1JfSU9fRVJST1I6Ci0J CQkJZXJyb3IgPSBnX2Vycm9yX25ldyhQVVJQTEVfS0VZUklOR19FUlJPUiwKLQkJCQkJUFVSUExF X0tFWVJJTkdfRVJST1JfQkFDS0VOREZBSUwsCi0JCQkJCSJGYWlsZWQgdG8gY29tbXVuaWNhdGUg d2l0aCBTZWNyZXQgIgotCQkJCQkiU2VydmljZSAoYWNjb3VudCA6ICVzKS4iLAotCQkJCQlwdXJw bGVfYWNjb3VudF9nZXRfdXNlcm5hbWUoYWNjb3VudCkpOwotCQkJCWlmIChjYiAhPSBOVUxMKQot CQkJCQljYihhY2NvdW50LCBOVUxMLCBlcnJvciwgc3RvcmFnZS0+dXNlcl9kYXRhKTsKLQkJCQln X2Vycm9yX2ZyZWUoZXJyb3IpOwotCQkJCWJyZWFrOwotCi0JCQlkZWZhdWx0OgotCQkJCXB1cnBs ZV9kZWJ1Z19lcnJvcigia2V5cmluZy1saWJzZWNyZXQiLAotCQkJCQkiVW5rbm93biBlcnJvciAo YWNjb3VudDogJXMgKCVzKSwgIgotCQkJCQkiZG9tYWluOiAlcywgY29kZTogJWQpOiAlcy5cbiIs Ci0JCQkJCXB1cnBsZV9hY2NvdW50X2dldF91c2VybmFtZShhY2NvdW50KSwKLQkJCQkJcHVycGxl X2FjY291bnRfZ2V0X3Byb3RvY29sX2lkKGFjY291bnQpLAotCQkJCQlnX3F1YXJrX3RvX3N0cmlu ZyhlcnJvci0+ZG9tYWluKSwgY29kZSwKLQkJCQkJCWVycm9yLT5tZXNzYWdlKTsKLQkJCQllcnJv ciA9IGdfZXJyb3JfbmV3KFBVUlBMRV9LRVlSSU5HX0VSUk9SLAotCQkJCQlQVVJQTEVfS0VZUklO R19FUlJPUl9CQUNLRU5ERkFJTCwKLQkJCQkJIlVua25vd24gZXJyb3IgKGFjY291bnQgOiAlcyku IiwKLQkJCQkJcHVycGxlX2FjY291bnRfZ2V0X3VzZXJuYW1lKGFjY291bnQpKTsKLQkJCQlpZiAo Y2IgIT0gTlVMTCkKLQkJCQkJY2IoYWNjb3VudCwgTlVMTCwgZXJyb3IsIHN0b3JhZ2UtPnVzZXJf ZGF0YSk7Ci0JCQkJZ19lcnJvcl9mcmVlKGVycm9yKTsKLQkJCQlicmVhazsKLQkJfQotCisJCXNz X2dfZXJyb3JfdG9fa2V5cmluZ19lcnJvcigmZXJyb3IsIGFjY291bnQpOwogCX0gZWxzZSBpZiAo cGFzc3dvcmQgPT0gTlVMTCkgewogCQllcnJvciA9IGdfZXJyb3JfbmV3KFBVUlBMRV9LRVlSSU5H X0VSUk9SLAogCQkJUFVSUExFX0tFWVJJTkdfRVJST1JfTk9QQVNTV09SRCwKIAkJCSJObyBwYXNz d29yZCBmb3VuZCBmb3IgYWNjb3VudDogJXMiLAogCQkJcHVycGxlX2FjY291bnRfZ2V0X3VzZXJu YW1lKGFjY291bnQpKTsKLQkJaWYgKGNiICE9IE5VTEwpCi0JCQljYihhY2NvdW50LCBOVUxMLCBl cnJvciwgc3RvcmFnZS0+dXNlcl9kYXRhKTsKLQkJZ19lcnJvcl9mcmVlKGVycm9yKTsKLQotCX0g ZWxzZSB7Ci0JCWlmIChjYiAhPSBOVUxMKQotCQkJY2IoYWNjb3VudCwgcGFzc3dvcmQsIE5VTEws IHN0b3JhZ2UtPnVzZXJfZGF0YSk7CiAJfQogCisJaWYgKGNiICE9IE5VTEwpIHsKKwkJY2IoYWNj b3VudCwgcGFzc3dvcmQsIGVycm9yLCBzdG9yYWdlLT51c2VyX2RhdGEpOworCX0KKworCWdfY2xl YXJfZXJyb3IoJmVycm9yKTsKIAlnX2ZyZWUoc3RvcmFnZSk7CiB9CiAKQEAgLTE2NSw1MSArMTcz LDE2IEBAIHNzX3NhdmVfY29udGludWUoR09iamVjdCAqb2JqZWN0LCBHQXN5bmMKIAlzZWNyZXRf cGFzc3dvcmRfc3RvcmVfZmluaXNoKHJlc3VsdCwgJmVycm9yKTsKIAogCWlmIChlcnJvciAhPSBO VUxMKSB7Ci0JCWludCBjb2RlID0gZXJyb3ItPmNvZGU7Ci0KLQkJc3dpdGNoIChjb2RlKSB7Ci0J CQljYXNlIEdfREJVU19FUlJPUl9TUEFXTl9TRVJWSUNFX05PVF9GT1VORDoKLQkJCWNhc2UgR19E QlVTX0VSUk9SX0lPX0VSUk9SOgotCQkJCXB1cnBsZV9kZWJ1Z19pbmZvKCJrZXlyaW5nLWxpYnNl Y3JldCIsCi0JCQkJCSJGYWlsZWQgdG8gY29tbXVuaWNhdGUgd2l0aCBTZWNyZXQgIgotCQkJCQki U2VydmljZSAoYWNjb3VudCA6ICVzICglcykpLlxuIiwKLQkJCQkJcHVycGxlX2FjY291bnRfZ2V0 X3VzZXJuYW1lKGFjY291bnQpLAotCQkJCQlwdXJwbGVfYWNjb3VudF9nZXRfcHJvdG9jb2xfaWQo YWNjb3VudCkpOwotCQkJCWVycm9yID0gZ19lcnJvcl9uZXcoUFVSUExFX0tFWVJJTkdfRVJST1Is Ci0JCQkJCVBVUlBMRV9LRVlSSU5HX0VSUk9SX0JBQ0tFTkRGQUlMLAotCQkJCQkiRmFpbGVkIHRv IGNvbW11bmljYXRlIHdpdGggU2VjcmV0IFNlcnZpY2UgKGFjY291bnQgOiAlcykuIiwKLQkJCQkJ cHVycGxlX2FjY291bnRfZ2V0X3VzZXJuYW1lKGFjY291bnQpKTsKLQkJCQlpZiAoY2IgIT0gTlVM TCkKLQkJCQkJY2IoYWNjb3VudCwgZXJyb3IsIHN0b3JhZ2UtPnVzZXJfZGF0YSk7Ci0JCQkJZ19l cnJvcl9mcmVlKGVycm9yKTsKLQkJCQlicmVhazsKLQotCQkJZGVmYXVsdDoKLQkJCQlwdXJwbGVf ZGVidWdfZXJyb3IoImtleXJpbmctbGlic2VjcmV0IiwKLQkJCQkJIlVua25vd24gZXJyb3IgKGFj Y291bnQ6ICVzICglcyksICIKLQkJCQkJImRvbWFpbjogJXMsIGNvZGU6ICVkKTogJXMuXG4iLAot CQkJCQlwdXJwbGVfYWNjb3VudF9nZXRfdXNlcm5hbWUoYWNjb3VudCksCi0JCQkJCXB1cnBsZV9h Y2NvdW50X2dldF9wcm90b2NvbF9pZChhY2NvdW50KSwKLQkJCQkJZ19xdWFya190b19zdHJpbmco ZXJyb3ItPmRvbWFpbiksIGNvZGUsCi0JCQkJCQllcnJvci0+bWVzc2FnZSk7Ci0JCQkJZXJyb3Ig PSBnX2Vycm9yX25ldyhQVVJQTEVfS0VZUklOR19FUlJPUiwKLQkJCQkJUFVSUExFX0tFWVJJTkdf RVJST1JfQkFDS0VOREZBSUwsCi0JCQkJCSJVbmtub3duIGVycm9yIChhY2NvdW50IDogJXMpLiIs Ci0JCQkJCXB1cnBsZV9hY2NvdW50X2dldF91c2VybmFtZShhY2NvdW50KSk7Ci0JCQkJaWYgKGNi ICE9IE5VTEwpCi0JCQkJCWNiKGFjY291bnQsIGVycm9yLCBzdG9yYWdlLT51c2VyX2RhdGEpOwot CQkJCWdfZXJyb3JfZnJlZShlcnJvcik7Ci0JCQkJYnJlYWs7Ci0JCX0KLQorCQlzc19nX2Vycm9y X3RvX2tleXJpbmdfZXJyb3IoJmVycm9yLCBhY2NvdW50KTsKIAl9IGVsc2UgewogCQlwdXJwbGVf ZGVidWdfaW5mbygia2V5cmluZy1saWJzZWNyZXQiLCAiUGFzc3dvcmQgZm9yICVzIHVwZGF0ZWQu XG4iLAogCQkJcHVycGxlX2FjY291bnRfZ2V0X3VzZXJuYW1lKGFjY291bnQpKTsKLQotCQlpZiAo Y2IgIT0gTlVMTCkKLQkJCWNiKGFjY291bnQsIE5VTEwsIHN0b3JhZ2UtPnVzZXJfZGF0YSk7CiAJ fQogCisJaWYgKGNiICE9IE5VTEwpCisJCWNiKGFjY291bnQsIGVycm9yLCBzdG9yYWdlLT51c2Vy X2RhdGEpOworCisJZ19jbGVhcl9lcnJvcigmZXJyb3IpOwogCWdfZnJlZShzdG9yYWdlKTsKIH0K IAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQ29tbWl0 cyBtYWlsaW5nIGxpc3QKQ29tbWl0c0BwaWRnaW4uaW0KaHR0cHM6Ly9waWRnaW4uaW0vY2dpLWJp bi9tYWlsbWFuL2xpc3RpbmZvL2NvbW1pdHM=