soc.2008.vv: 2f1ccb85: Use the right namespaces for broadcastin...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 2f1ccb850bd4a0b8c73c3f30fb99e93716a948db
Ancestor: 26662bb012bff66207ba3801fed6539aa2ad9ac0
Author: maiku at soc.pidgin.im
Date: 2008-06-06T21:10:16
Branch: im.pidgin.soc.2008.vv
URL: http://d.pidgin.im/viewmtn/revision/info/2f1ccb850bd4a0b8c73c3f30fb99e93716a948db

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

ChangeLog: 

Use the right namespaces for broadcasting and discovering Jingle support.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/disco.c	cc7536d85ced5961209687186730f9d71abe9e18
+++ libpurple/protocols/jabber/disco.c	cdaec6feb4998a000ffcc764369946f149c889d8
@@ -148,11 +148,10 @@ void jabber_disco_info_parse(JabberStrea
 			SUPPORT_FEATURE("http://www.google.com/transport/p2p");
 			SUPPORT_FEATURE("http://www.google.com/transport/raw-udp");
 			SUPPORT_FEATURE("http://www.google.com/session/phone");
-			SUPPORT_FEATURE("http://www.xmpp.org/extensions/xep-0166.html");
-			SUPPORT_FEATURE("http://www.xmpp.org/extensions/xep-0180.html");
-			SUPPORT_FEATURE("http://www.xmpp.org/extensions/xep-0167.html");
-			SUPPORT_FEATURE("http://www.xmpp.org/extensions/xep-0176.html");
-			SUPPORT_FEATURE("http://www.xmpp.org/extensions/xep-0177.html");
+			SUPPORT_FEATURE("urn:xmpp:tmp:jingle");
+			SUPPORT_FEATURE("urn:xmpp:tmp:jingle:apps:rtp#audio");
+			SUPPORT_FEATURE("urn:xmpp:tmp:jingle:apps:rtp#video");
+			SUPPORT_FEATURE("urn:xmpp:tmp:jingle:transports:ice-udp");
 #endif
 		} else {
 			const char *ext = NULL;
============================================================
--- libpurple/protocols/jabber/jabber.c	d88b85130b9dca29d5a133e1e724b15469be6393
+++ libpurple/protocols/jabber/jabber.c	739829fa28bf084efe0bac34efc73754c54684ce
@@ -61,8 +61,8 @@
 #ifdef USE_VV
 #include <gst/farsight/fs-conference-iface.h>
 
-#define XEP_0167_CAP "http://www.xmpp.org/extensions/xep-0167.html"
-#define XEP_0180_CAP "http://www.xmpp.org/extensions/xep-0180.html"
+#define XEP_0167_AUDIO_CAP "urn:xmpp:tmp:jingle:apps:rtp#audio"
+#define XEP_0167_VIDEO_CAP "urn:xmpp:tmp:jingle:apps:rtp#video"
 #define GTALK_CAP "http://www.google.com/session/phone"
 
 #endif
@@ -2395,18 +2395,18 @@ gboolean jabber_can_do_media(PurpleConne
 	if (type == (PURPLE_MEDIA_AUDIO | PURPLE_MEDIA_VIDEO)) {
 		purple_debug_info("jabber", 
 				  "Checking audio/video XEP support for %s\n", who);
-		return (jabber_buddy_has_capability(jb, XEP_0167_CAP) ||
+		return (jabber_buddy_has_capability(jb, XEP_0167_AUDIO_CAP) ||
 				jabber_buddy_has_capability(jb, GTALK_CAP)) && 
-				jabber_buddy_has_capability(jb, XEP_0180_CAP);
+				jabber_buddy_has_capability(jb, XEP_0167_VIDEO_CAP);
 	} else if (type == (PURPLE_MEDIA_AUDIO)) {
 		purple_debug_info("jabber", 
 				  "Checking audio XEP support for %s\n", who);
-		return jabber_buddy_has_capability(jb, XEP_0167_CAP) ||
+		return jabber_buddy_has_capability(jb, XEP_0167_AUDIO_CAP) ||
 				jabber_buddy_has_capability(jb, GTALK_CAP);
 	} else if (type == (PURPLE_MEDIA_VIDEO)) {
 		purple_debug_info("jabber", 
 				  "Checking video XEP support for %s\n", who);
-		return jabber_buddy_has_capability(jb, XEP_0180_CAP);
+		return jabber_buddy_has_capability(jb, XEP_0167_VIDEO_CAP);
 	}
 
 	return FALSE;