diff libpurple/protocols/jabber/libxmpp.c @ 24943:4d752d07a126

propagate from branch 'im.pidgin.pidgin' (head 25e27ca0f73c4714d17fcdf83d0e4ce7e63bc55d) to branch 'im.pidgin.maiku.vv' (head b9da65a837c05d63e2515eca9d9e118499672003)

--- a/libpurple/protocols/jabber/libxmpp.c	Fri Sep 26 16:26:56 2008 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Sat Sep 27 04:44:17 2008 +0000
@@ -116,9 +116,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)
@@ -289,6 +295,9 @@
 					   jabber_custom_smileys_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
 }