cpw.darkrain42.xmpp.bosh: 9af1e1f6: Fix merge: Move the Jingle features to j...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 9af1e1f665d3daa2e845a4c1fcc4be300adad70f
Ancestor: 69df050726e751143230a6652831fcb4c32a1cdd
Author: paul at darkrain42.org
Date: 2009-04-04T03:40:43
Branch: im.pidgin.cpw.darkrain42.xmpp.bosh
URL: http://d.pidgin.im/viewmtn/revision/info/9af1e1f665d3daa2e845a4c1fcc4be300adad70f

Modified files:
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/jabber.c

ChangeLog: 

Fix merge: Move the Jingle features to jabber.c

Maiku: Should these (specifically the voice and video) parts only be
advertised if the core indicates the current UI supports each individually?

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/disco.c	ff6a1876ffd6ccd599bbff80406f0a79ce367b83
+++ libpurple/protocols/jabber/disco.c	88756c00dda0960e7d40c1b585391b40ab847f2f
@@ -148,16 +148,6 @@ void jabber_disco_info_parse(JabberStrea
 					xmlnode_set_attrib(feature, "var", feat->namespace);
 				}	
 			}
-#ifdef USE_VV
-		} else if (node && !strcmp(node, CAPS0115_NODE "#voice-v1")) {
-			SUPPORT_FEATURE("http://www.google.com/xmpp/protocol/session");
-			SUPPORT_FEATURE("http://www.google.com/xmpp/protocol/voice/v1");
-			SUPPORT_FEATURE(JINGLE);
-			SUPPORT_FEATURE(JINGLE_APP_RTP_SUPPORT_AUDIO);
-			SUPPORT_FEATURE(JINGLE_APP_RTP_SUPPORT_VIDEO);
-			SUPPORT_FEATURE(JINGLE_TRANSPORT_RAWUDP);
-			SUPPORT_FEATURE(JINGLE_TRANSPORT_ICEUDP);
-#endif
 		} else {
 			xmlnode *error, *inf;
 				
============================================================
--- libpurple/protocols/jabber/jabber.c	8bf340ee80866c08e9d35b626af05a667c883ebe
+++ libpurple/protocols/jabber/jabber.c	ef3c420067b22508c3513caa1cf39fa352ed3f6a
@@ -3169,7 +3169,16 @@ jabber_init_plugin(PurplePlugin *plugin)
 	jabber_add_feature("http://jabber.org/protocol/si/profile/file-transfer", 0);
 	jabber_add_feature("http://jabber.org/protocol/xhtml-im", 0);
 	jabber_add_feature("urn:xmpp:ping", 0);
-	
+
+	/* Jingle features! */
+	jabber_add_feature("http://www.google.com/xmpp/protocol/session", 0);
+	jabber_add_feature("http://www.google.com/xmpp/protocol/voice/v1", 0);
+	jabber_add_feature(JINGLE, 0);
+	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, 0);
+	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, 0);
+	jabber_add_feature(JINGLE_TRANSPORT_RAWUDP, 0);
+	jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0);
+
 	/* IPC functions */
 	purple_plugin_ipc_register(plugin, "contact_has_feature", PURPLE_CALLBACK(jabber_ipc_contact_has_feature),
 							 purple_marshal_BOOLEAN__POINTER_POINTER_POINTER,