Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/presence.c @ 29533:8a50c08c289d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Declare XMPP got media caps in the correct place.
author maiku@pidgin.im
date Tue, 20 Oct 2009 21:39:16 +0000
parents f3f7f683fda5
children 7819d3819f4c
comparison
equal deleted inserted replaced
29532:c5712737e59a 29533:8a50c08c289d
456 } 456 }
457 457
458 jbr->caps.info = info; 458 jbr->caps.info = info;
459 jbr->caps.exts = exts; 459 jbr->caps.exts = exts;
460 460
461 purple_prpl_got_media_caps(
462 purple_connection_get_account(userdata->js->gc),
463 userdata->from);
464
461 if (info == NULL) 465 if (info == NULL)
462 goto out; 466 goto out;
463 467
464 if (!jbr->commands_fetched && jabber_resource_has_capability(jbr, "http://jabber.org/protocol/commands")) { 468 if (!jbr->commands_fetched && jabber_resource_has_capability(jbr, "http://jabber.org/protocol/commands")) {
465 JabberIq *iq = jabber_iq_new_query(userdata->js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items"); 469 JabberIq *iq = jabber_iq_new_query(userdata->js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items");
469 jabber_iq_set_callback(iq, jabber_adhoc_disco_result_cb, NULL); 473 jabber_iq_set_callback(iq, jabber_adhoc_disco_result_cb, NULL);
470 jabber_iq_send(iq); 474 jabber_iq_send(iq);
471 475
472 jbr->commands_fetched = TRUE; 476 jbr->commands_fetched = TRUE;
473 } 477 }
474
475 purple_prpl_got_media_caps(
476 purple_connection_get_account(userdata->js->gc),
477 userdata->from);
478 478
479 #if 0 479 #if 0
480 /* 480 /*
481 * Versions of libpurple before 2.6.0 didn't advertise this capability, so 481 * Versions of libpurple before 2.6.0 didn't advertise this capability, so
482 * we can't yet use Entity Capabilities to determine whether or not the 482 * we can't yet use Entity Capabilities to determine whether or not the