Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/libxmpp.c @ 26675:b290c7b9fc73
propagate from branch 'im.pidgin.pidgin' (head 3c568b43fb4447b65a2b06e6767340edd7763c53)
to branch 'org.darkrain42.pidgin.disco' (head ead0d4fe7ad002d288919e966edd3a24ef98edfc)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 09 Apr 2009 04:27:58 +0000 |
| parents | 6f0200f1e497 f5e613e05332 |
| children | 1de01f9594c8 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/libxmpp.c Thu Apr 09 01:59:24 2009 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Thu Apr 09 04:27:58 2009 +0000 @@ -34,6 +34,7 @@ #include "iq.h" #include "jabber.h" #include "chat.h" +#include "disco.h" #include "message.h" #include "roster.h" #include "si.h" @@ -117,10 +118,14 @@ jabber_unregister_account, /* unregister_user */ jabber_send_attention, /* send_attention */ jabber_attention_types, /* attention_types */ + sizeof(PurplePluginProtocolInfo), /* struct_size */ NULL, /* get_account_text_table */ jabber_initiate_media, /* initiate_media */ jabber_get_media_caps, /* get_media_caps */ + jabber_disco_get_list, /* disco_get_list */ + jabber_disco_cancel, /* disco_cancel */ + jabber_disco_service_register /* disco_service_register */ }; static gboolean load_plugin(PurplePlugin *plugin) @@ -298,9 +303,6 @@ jabber_add_feature("ibb", XEP_0047_NAMESPACE, NULL); 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 }