Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/presence.c @ 26569:bc7fac8e2f79
propagate from branch 'im.pidgin.pidgin' (head f144c6bda9daf701aa891c875fce7a4dedd611ae)
to branch 'im.pidgin.cpw.darkrain42.xmpp.bosh' (head 8b60514f2b44295e87ee3587669aec5059556149)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 05 Apr 2009 21:13:10 +0000 |
parents | b01e8e76c59d 4f14455a86d2 |
children | 3912f55a1633 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/presence.c Sun Apr 05 03:25:00 2009 +0000 +++ b/libpurple/protocols/jabber/presence.c Sun Apr 05 21:13:10 2009 +0000 @@ -315,14 +315,16 @@ g_free(jap); } -static void jabber_vcard_parse_avatar(JabberStream *js, xmlnode *packet, gpointer blah) +static void +jabber_vcard_parse_avatar(JabberStream *js, const char *from, + JabberIqType type, const char *id, + xmlnode *packet, gpointer blah) { JabberBuddy *jb = NULL; xmlnode *vcard, *photo, *binval; char *text; guchar *data; gsize size; - const char *from = xmlnode_get_attrib(packet, "from"); if(!from) return;