Mercurial > pidgin
comparison libpurple/protocols/jabber/presence.c @ 29328:1e19c439fa7a
propagate from branch 'im.pidgin.pidgin' (head 07dc6851f4d16e9c89791c488bbc6d3b2bdb8ecf)
to branch 'im.pidgin.pidgin.next.minor' (head 3716aff37a220834473555f2a4143810736e51f8)
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 30 Nov 2009 06:24:32 +0000 |
parents | cfca0217d162 c4f836780e1c |
children | c38f6e6bf4ce |
comparison
equal
deleted
inserted
replaced
28688:dbd030780f75 | 29328:1e19c439fa7a |
---|---|
455 g_list_free(jbr->caps.exts); | 455 g_list_free(jbr->caps.exts); |
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 | |
461 purple_prpl_got_media_caps( | |
462 purple_connection_get_account(userdata->js->gc), | |
463 userdata->from); | |
460 | 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")) { |