Mercurial > pidgin.yaz
changeset 16662:a0a359d20d09
merge of '132fa9527970403283e8e3418c010de94a4908fb'
and 'c2e429692e25b126620781c16fc59d14b601dc5c'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 29 Apr 2007 17:15:45 +0000 |
| parents | 9b47e29ba76c (current diff) a6854e3043a4 (diff) |
| children | 9b41a619d2f7 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/auth.c Sun Apr 29 16:56:12 2007 +0000 +++ b/libpurple/protocols/jabber/auth.c Sun Apr 29 17:15:45 2007 +0000 @@ -819,7 +819,7 @@ } else { response = xmlnode_new("response"); xmlnode_set_namespace(response, "urn:ietf:params:xml:ns:xmpp-sasl"); - if (c_out) { + if (clen > 0) { enc_out = purple_base64_encode((unsigned char*)c_out, clen); xmlnode_insert_data(response, enc_out, -1); g_free(enc_out);
--- a/pidgin/gtkstatusbox.c Sun Apr 29 16:56:12 2007 +0000 +++ b/pidgin/gtkstatusbox.c Sun Apr 29 17:15:45 2007 +0000 @@ -1447,10 +1447,10 @@ size_t len = 0; if (filename) data = pidgin_convert_buddy_icon(plug, filename, &len); - img = purple_buddy_icons_set_account_icon(box->account, data, len); - purple_account_set_buddy_icon_path(box->account, filename); + img = purple_buddy_icons_set_account_icon(account, data, len); + purple_account_set_buddy_icon_path(account, filename); - purple_account_set_bool(box->account, "use-global-buddyicon", (filename != NULL)); + purple_account_set_bool(account, "use-global-buddyicon", (filename != NULL)); } } }