/pidgin/main: bb021423c1bb: libsecret-keyring: Use correct *_fin...

Mike Ruprecht <[email protected]> Wed, 19 Oct 2016 14:50:57 -0400
Newsgroups gmane.comp.gnome.gaim.cvs
Message-ID <[email protected]>
Q2hhbmdlc2V0OiBiYjAyMTQyM2MxYmI3NjE4Yjc2NGU3M2U4NjYxYzcwZDI3YzA0MTBjCkF1dGhv
cjoJIE1pa2UgUnVwcmVjaHQgPGNtYWlrdUBnbWFpbC5jb20+CkRhdGU6CSAyMDE2LTA5LTE0IDEy
OjA2IC0wNTAwCkJyYW5jaDoJIGRlZmF1bHQKVVJMOiBodHRwczovL2hnLnBpZGdpbi5pbS9waWRn
aW4vbWFpbi9yZXYvYmIwMjE0MjNjMWJiCgpEZXNjcmlwdGlvbjoKCmxpYnNlY3JldC1rZXlyaW5n
OiBVc2UgY29ycmVjdCAqX2ZpbmlzaCgpIGZ1bmN0aW9ucwoKR2lvIGFzeW5jICpfZmluaXNoKCkg
ZnVuY3Rpb25zIG5lZWQgdG8gYmUgbWF0Y2hlZCB0byB0aGVpciBhc3luYwpmdW5jdGlvbnMuIFRo
aXMgcGF0Y2ggc3BsaXRzIHRoZSBzc19zYXZlX2NvbnRpbnVlKCkgY2FsbGJhY2sgaW50bwpzZXBh
cmF0ZSBmdW5jdGlvbnMgdG8gdXNlIHRoZSBjb3JyZWN0IG9uZXMuCgpkaWZmc3RhdDoKCiBsaWJw
dXJwbGUvcGx1Z2lucy9rZXlyaW5ncy9zZWNyZXRzZXJ2aWNlLmMgfCAgMjkgKysrKysrKysrKysr
KysrKysrKysrKystLS0tLS0KIDEgZmlsZXMgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgNiBk
ZWxldGlvbnMoLSkKCmRpZmZzICg2OCBsaW5lcyk6CgpkaWZmIC0tZ2l0IGEvbGlicHVycGxlL3Bs
dWdpbnMva2V5cmluZ3Mvc2VjcmV0c2VydmljZS5jIGIvbGlicHVycGxlL3BsdWdpbnMva2V5cmlu
Z3Mvc2VjcmV0c2VydmljZS5jCi0tLSBhL2xpYnB1cnBsZS9wbHVnaW5zL2tleXJpbmdzL3NlY3Jl
dHNlcnZpY2UuYworKysgYi9saWJwdXJwbGUvcGx1Z2lucy9rZXlyaW5ncy9zZWNyZXRzZXJ2aWNl
LmMKQEAgLTE2MCwxOCArMTYwLDE1IEBAIHNzX3JlYWQoUHVycGxlQWNjb3VudCAqYWNjb3VudCwg
UHVycGxlS2UKIH0KIAogc3RhdGljIHZvaWQKLXNzX3NhdmVfY29udGludWUoR09iamVjdCAqb2Jq
ZWN0LCBHQXN5bmNSZXN1bHQgKnJlc3VsdCwgZ3BvaW50ZXIgZGF0YSkKK3NzX3NhdmVfY29udGlu
dWUoR0Vycm9yICplcnJvciwgZ3BvaW50ZXIgZGF0YSkKIHsKIAlJbmZvU3RvcmFnZSAqc3RvcmFn
ZSA9IGRhdGE7CiAJUHVycGxlS2V5cmluZ1NhdmVDYWxsYmFjayBjYjsKLQlHRXJyb3IgKmVycm9y
ID0gTlVMTDsKIAlQdXJwbGVBY2NvdW50ICphY2NvdW50OwogCiAJYWNjb3VudCA9IHN0b3JhZ2Ut
PmFjY291bnQ7CiAJY2IgPSBzdG9yYWdlLT5jYjsKIAotCXNlY3JldF9wYXNzd29yZF9zdG9yZV9m
aW5pc2gocmVzdWx0LCAmZXJyb3IpOwotCiAJaWYgKGVycm9yICE9IE5VTEwpIHsKIAkJc3NfZ19l
cnJvcl90b19rZXlyaW5nX2Vycm9yKCZlcnJvciwgYWNjb3VudCk7CiAJfSBlbHNlIHsKQEAgLTE4
Nyw2ICsxODQsMjYgQEAgc3Nfc2F2ZV9jb250aW51ZShHT2JqZWN0ICpvYmplY3QsIEdBc3luYwog
fQogCiBzdGF0aWMgdm9pZAorc3Nfc3RvcmVfY29udGludWUoR09iamVjdCAqb2JqZWN0LCBHQXN5
bmNSZXN1bHQgKnJlc3VsdCwgZ3BvaW50ZXIgZGF0YSkKK3sKKwlHRXJyb3IgKmVycm9yID0gTlVM
TDsKKworCXNlY3JldF9wYXNzd29yZF9zdG9yZV9maW5pc2gocmVzdWx0LCAmZXJyb3IpOworCisJ
c3Nfc2F2ZV9jb250aW51ZShlcnJvciwgZGF0YSk7Cit9CisKK3N0YXRpYyB2b2lkCitzc19jbGVh
cl9jb250aW51ZShHT2JqZWN0ICpvYmplY3QsIEdBc3luY1Jlc3VsdCAqcmVzdWx0LCBncG9pbnRl
ciBkYXRhKQoreworCUdFcnJvciAqZXJyb3IgPSBOVUxMOworCisJc2VjcmV0X3Bhc3N3b3JkX2Ns
ZWFyX2ZpbmlzaChyZXN1bHQsICZlcnJvcik7CisKKwlzc19zYXZlX2NvbnRpbnVlKGVycm9yLCBk
YXRhKTsKK30KKworc3RhdGljIHZvaWQKIHNzX3NhdmUoUHVycGxlQWNjb3VudCAqYWNjb3VudCwK
ICAgICAgICAgIGNvbnN0IGdjaGFyICpwYXNzd29yZCwKICAgICAgICAgIFB1cnBsZUtleXJpbmdT
YXZlQ2FsbGJhY2sgY2IsCkBAIC0yMDgsNyArMjI1LDcgQEAgc3Nfc2F2ZShQdXJwbGVBY2NvdW50
ICphY2NvdW50LAogCiAJCWxhYmVsID0gZ19zdHJkdXBfcHJpbnRmKF8oIlBpZGdpbiBJTSBwYXNz
d29yZCBmb3IgYWNjb3VudCAlcyIpLCB1c2VybmFtZSk7CiAJCXNlY3JldF9wYXNzd29yZF9zdG9y
ZSgmcHVycGxlX3NjaGVtYSwgU0VDUkVUX0NPTExFQ1RJT05fREVGQVVMVCwKLQkJCWxhYmVsLCBw
YXNzd29yZCwgTlVMTCwgc3Nfc2F2ZV9jb250aW51ZSwgc3RvcmFnZSwKKwkJCWxhYmVsLCBwYXNz
d29yZCwgTlVMTCwgc3Nfc3RvcmVfY29udGludWUsIHN0b3JhZ2UsCiAJCQkidXNlciIsIHVzZXJu
YW1lLAogCQkJInByb3RvY29sIiwgcHVycGxlX2FjY291bnRfZ2V0X3Byb3RvY29sX2lkKGFjY291
bnQpLAogCQkJTlVMTCk7CkBAIC0yMjAsNyArMjM3LDcgQEAgc3Nfc2F2ZShQdXJwbGVBY2NvdW50
ICphY2NvdW50LAogCQkJcHVycGxlX2FjY291bnRfZ2V0X3VzZXJuYW1lKGFjY291bnQpLAogCQkJ
cHVycGxlX2FjY291bnRfZ2V0X3Byb3RvY29sX2lkKGFjY291bnQpKTsKIAotCQlzZWNyZXRfcGFz
c3dvcmRfY2xlYXIoJnB1cnBsZV9zY2hlbWEsIE5VTEwsIHNzX3NhdmVfY29udGludWUsCisJCXNl
Y3JldF9wYXNzd29yZF9jbGVhcigmcHVycGxlX3NjaGVtYSwgTlVMTCwgc3NfY2xlYXJfY29udGlu
dWUsCiAJCQlzdG9yYWdlLCAidXNlciIsIHB1cnBsZV9hY2NvdW50X2dldF91c2VybmFtZShhY2Nv
dW50KSwKIAkJCSJwcm90b2NvbCIsIHB1cnBsZV9hY2NvdW50X2dldF9wcm90b2NvbF9pZChhY2Nv
dW50KSwKIAkJCU5VTEwpOwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX18KQ29tbWl0cyBtYWlsaW5nIGxpc3QKQ29tbWl0c0BwaWRnaW4uaW0KaHR0cHM6Ly9w
aWRnaW4uaW0vY2dpLWJpbi9tYWlsbWFuL2xpc3RpbmZvL2NvbW1pdHM=