Mercurial > pidgin
comparison src/protocols/jabber/presence.c @ 11361:e4868370c433
[gaim-migrate @ 13585]
cleaning out my tree
committer: Tailor Script <tailor@pidgin.im>
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Mon, 29 Aug 2005 04:53:17 +0000 |
parents | ad9a61894d9b |
children | e36f0f9debb5 |
comparison
equal
deleted
inserted
replaced
11360:cf15c1cdcfbd | 11361:e4868370c433 |
---|---|
219 js->pending_avatar_requests = g_slist_remove(js->pending_avatar_requests, jb); | 219 js->pending_avatar_requests = g_slist_remove(js->pending_avatar_requests, jb); |
220 | 220 |
221 if((vcard = xmlnode_get_child(packet, "vCard")) || | 221 if((vcard = xmlnode_get_child(packet, "vCard")) || |
222 (vcard = xmlnode_get_child_with_namespace(packet, "query", "vcard-temp"))) { | 222 (vcard = xmlnode_get_child_with_namespace(packet, "query", "vcard-temp"))) { |
223 if((photo = xmlnode_get_child(vcard, "PHOTO")) && | 223 if((photo = xmlnode_get_child(vcard, "PHOTO")) && |
224 (binval = xmlnode_get_child(photo, "BINVAL")) && | 224 (( (binval = xmlnode_get_child(photo, "BINVAL")) && |
225 (text = xmlnode_get_data(binval))) { | 225 (text = xmlnode_get_data(binval))) || |
226 (text = xmlnode_get_data(photo)))) { | |
226 data = gaim_base64_decode(text, &size); | 227 data = gaim_base64_decode(text, &size); |
227 | 228 |
228 gaim_buddy_icons_set_for_user(js->gc->account, from, data, size); | 229 gaim_buddy_icons_set_for_user(js->gc->account, from, data, size); |
229 if((b = gaim_find_buddy(js->gc->account, from))) { | 230 if((b = gaim_find_buddy(js->gc->account, from))) { |
230 unsigned char hashval[20]; | 231 unsigned char hashval[20]; |