# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1238816443 0
# Node ID 1ecbda91458ac9ed083e23f4207af5999646ec24
# Parent  882748e27f9d75ce74ccf049b8ffdf8072983f1e
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?

diff -r 882748e27f9d -r 1ecbda91458a libpurple/protocols/jabber/disco.c
--- a/libpurple/protocols/jabber/disco.c	Sat Apr 04 03:15:59 2009 +0000
+++ b/libpurple/protocols/jabber/disco.c	Sat Apr 04 03:40:43 2009 +0000
@@ -148,16 +148,6 @@
 					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;
 				
diff -r 882748e27f9d -r 1ecbda91458a libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Sat Apr 04 03:15:59 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Apr 04 03:40:43 2009 +0000
@@ -3169,7 +3169,16 @@
 	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,