Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 26545:b01e8e76c59d | 26569:bc7fac8e2f79 |
|---|---|
| 313 jap->who, "unsubscribed"); | 313 jap->who, "unsubscribed"); |
| 314 g_free(jap->who); | 314 g_free(jap->who); |
| 315 g_free(jap); | 315 g_free(jap); |
| 316 } | 316 } |
| 317 | 317 |
| 318 static void jabber_vcard_parse_avatar(JabberStream *js, xmlnode *packet, gpointer blah) | 318 static void |
| 319 jabber_vcard_parse_avatar(JabberStream *js, const char *from, | |
| 320 JabberIqType type, const char *id, | |
| 321 xmlnode *packet, gpointer blah) | |
| 319 { | 322 { |
| 320 JabberBuddy *jb = NULL; | 323 JabberBuddy *jb = NULL; |
| 321 xmlnode *vcard, *photo, *binval; | 324 xmlnode *vcard, *photo, *binval; |
| 322 char *text; | 325 char *text; |
| 323 guchar *data; | 326 guchar *data; |
| 324 gsize size; | 327 gsize size; |
| 325 const char *from = xmlnode_get_attrib(packet, "from"); | |
| 326 | 328 |
| 327 if(!from) | 329 if(!from) |
| 328 return; | 330 return; |
| 329 | 331 |
| 330 jb = jabber_buddy_find(js, from, TRUE); | 332 jb = jabber_buddy_find(js, from, TRUE); |