comparison libpurple/protocols/jabber/presence.c @ 26567:242a8c97270b

propagate from branch 'im.pidgin.pidgin' (head f144c6bda9daf701aa891c875fce7a4dedd611ae) to branch 'im.pidgin.cpw.darkrain42.xmpp.avatars' (head 94d20f2f1d6e10ad1543c226dc01fb5c518bcea0)
author Paul Aurich <paul@darkrain42.org>
date Sun, 05 Apr 2009 21:49:01 +0000
parents 7e020fbe2cdb 4f14455a86d2
children fef989505ea2
comparison
equal deleted inserted replaced
26360:14e1f9af369f 26567:242a8c97270b
270 /* JEP-0115 */ 270 /* JEP-0115 */
271 c = xmlnode_new_child(presence, "c"); 271 c = xmlnode_new_child(presence, "c");
272 xmlnode_set_namespace(c, "http://jabber.org/protocol/caps"); 272 xmlnode_set_namespace(c, "http://jabber.org/protocol/caps");
273 xmlnode_set_attrib(c, "node", CAPS0115_NODE); 273 xmlnode_set_attrib(c, "node", CAPS0115_NODE);
274 xmlnode_set_attrib(c, "ver", VERSION); 274 xmlnode_set_attrib(c, "ver", VERSION);
275 #ifdef USE_VV
276 /* Make sure this is 'voice-v1', or you won't be able to talk to Google Talk */
277 xmlnode_set_attrib(c, "ext", "voice-v1");
278 #endif
275 279
276 if(js != NULL) { 280 if(js != NULL) {
277 /* add the extensions */ 281 /* add the extensions */
278 char extlist[1024]; 282 char extlist[1024];
279 unsigned remaining = 1023; /* one less for the \0 */ 283 unsigned remaining = 1023; /* one less for the \0 */
332 jap->who, "unsubscribed"); 336 jap->who, "unsubscribed");
333 g_free(jap->who); 337 g_free(jap->who);
334 g_free(jap); 338 g_free(jap);
335 } 339 }
336 340
337 static void jabber_vcard_parse_avatar(JabberStream *js, xmlnode *packet, gpointer blah) 341 static void
342 jabber_vcard_parse_avatar(JabberStream *js, const char *from,
343 JabberIqType type, const char *id,
344 xmlnode *packet, gpointer blah)
338 { 345 {
339 JabberBuddy *jb = NULL; 346 JabberBuddy *jb = NULL;
340 xmlnode *vcard, *photo, *binval; 347 xmlnode *vcard, *photo, *binval;
341 char *text; 348 char *text;
342 guchar *data; 349 guchar *data;
343 gsize size; 350 gsize size;
344 const char *from = xmlnode_get_attrib(packet, "from");
345 351
346 if(!from) 352 if(!from)
347 return; 353 return;
348 354
349 jb = jabber_buddy_find(js, from, TRUE); 355 jb = jabber_buddy_find(js, from, TRUE);