Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/libxmpp.c @ 29658:a0fd6a41d127
propagate from branch 'im.pidgin.pidgin' (head 1203a733696f95eef53b04b5078e0a779371b4d3)
to branch 'im.pidgin.cpw.attention_ui' (head 37530586a02ebf04f4d6002ba9e30f0ff49eb527)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 07 Dec 2008 01:37:06 +0000 |
| parents | f763be370afb 8e7e6f60e053 |
| children | d15b50a4db53 |
comparison
equal
deleted
inserted
replaced
| 24604:918738a0bba4 | 29658:a0fd6a41d127 |
|---|---|
| 281 | 281 |
| 282 jabber_data_init(); | 282 jabber_data_init(); |
| 283 | 283 |
| 284 jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb); | 284 jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb); |
| 285 jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb); | 285 jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb); |
| 286 jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns", | 286 jabber_add_feature("buzz", XEP_0224_NAMESPACE, |
| 287 jabber_buzz_isenabled); | 287 jabber_buzz_isenabled); |
| 288 jabber_add_feature("bob", XEP_0231_NAMESPACE, | 288 jabber_add_feature("bob", XEP_0231_NAMESPACE, |
| 289 jabber_custom_smileys_isenabled); | 289 jabber_custom_smileys_isenabled); |
| 290 | 290 |
| 291 jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata); | 291 jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata); |