Mercurial > pidgin
diff libpurple/protocols/jabber/libxmpp.c @ 23867:4bc74deeb503
propagate from branch 'im.pidgin.pidgin' (head 434563a4b8fadb9593c241db4bb5ffd0bf2c0627)
to branch 'im.pidgin.soc.2008.vv' (head 59d05cb38af9346d82ce57477273f7b381054bcc)
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Sat, 09 Aug 2008 02:24:38 +0000 |
parents | c014c3fe0de9 3da0957e7821 |
children | 4d752d07a126 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/libxmpp.c Fri Aug 08 23:34:27 2008 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Sat Aug 09 02:24: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) @@ -275,6 +281,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 }