Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/libxmpp.c @ 26567:242a8c97270b
propagate from branch 'im.pidgin.pidgin' (head f144c6bda9daf701aa891c875fce7a4dedd611ae)
to branch 'im.pidgin.cpw.darkrain42.xmpp.avatars' (head 94d20f2f1d6e10ad1543c226dc01fb5c518bcea0)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 05 Apr 2009 21:49:01 +0000 |
| parents | 7e020fbe2cdb 6f0200f1e497 |
| children | 3912f55a1633 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/libxmpp.c Fri Apr 03 02:42:56 2009 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Sun Apr 05 21:49:01 2009 +0000 @@ -119,7 +119,9 @@ jabber_attention_types, /* attention_types */ sizeof(PurplePluginProtocolInfo), /* struct_size */ - NULL + NULL, /* get_account_text_table */ + jabber_initiate_media, /* initiate_media */ + jabber_get_media_caps, /* get_media_caps */ }; static gboolean load_plugin(PurplePlugin *plugin) @@ -293,7 +295,11 @@ jabber_add_feature("bob", XEP_0231_NAMESPACE, jabber_custom_smileys_isenabled); jabber_add_feature("ibb", XEP_0047_NAMESPACE, NULL); + +#ifdef USE_VV + jabber_add_feature("voice-v1", "http://www.xmpp.org/extensions/xep-0167.html#ns", NULL); +#endif } -PURPLE_INIT_PLUGIN(jabber, init_plugin, info); +PURPLE_INIT_PLUGIN(jabber, init_plugin, info); \ No newline at end of file