Mercurial > pidgin
comparison libpurple/protocols/jabber/presence.c @ 29234:e77894113a14
propagate from branch 'im.pidgin.pidgin' (head 122c09fb418ceb629bb942da06d3a45a22f19680)
to branch 'im.pidgin.pidgin.next.minor' (head d47e94f98ed0b6e0a095e1f7c55cffb5a862316b)
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sun, 08 Nov 2009 20:37:06 +0000 |
| parents | 96ba7fd24177 7819d3819f4c |
| children | c4f836780e1c |
comparison
equal
deleted
inserted
replaced
| 28525:13e668ef158d | 29234:e77894113a14 |
|---|---|
| 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")) { |