Mercurial > pidgin
diff libpurple/protocols/jabber/libxmpp.c @ 23840:3da0957e7821
propagate from branch 'im.pidgin.pidgin' (head 868098fbe53290a8abcc3307c6fec2c6054a5e00)
to branch 'im.pidgin.soc.2008.vv' (head eb4a2834050e39f5387e97121b534adb7ffd1234)
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Thu, 26 Jun 2008 20:25:38 +0000 |
| parents | 30b5f145a0f7 10f5a529d2a6 |
| children | 4bc74deeb503 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/libxmpp.c Thu Jun 26 19:08:55 2008 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Thu Jun 26 20:25:38 2008 +0000 @@ -115,9 +115,15 @@ jabber_unregister_account, /* unregister_user */ jabber_send_attention, /* send_attention */ jabber_attention_types, /* attention_types */ - sizeof(PurplePluginProtocolInfo), /* struct_size */ - NULL + NULL, /* get_account_text_table */ +#ifdef USE_VV + jabber_initiate_media, /* initiate_media */ + jabber_can_do_media /* can_do_media */ +#else + NULL, /* initiate_media */ + NULL /* can_do_media */ +#endif }; static gboolean load_plugin(PurplePlugin *plugin) @@ -268,6 +274,9 @@ jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns", jabber_buzz_isenabled); jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata); +#ifdef USE_VV + jabber_add_feature("voice-v1", "http://www.xmpp.org/extensions/xep-0167.html#ns", NULL); +#endif }