Mercurial > pidgin.yaz
changeset 25677:48fe9a9e20e2
Use the right namespaces for broadcasting and discovering Jingle support.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Fri, 06 Jun 2008 21:10:16 +0000 |
| parents | 157b30b530f4 |
| children | 1fb16d784ccb |
| files | libpurple/protocols/jabber/disco.c libpurple/protocols/jabber/jabber.c |
| diffstat | 2 files changed, 10 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/disco.c Fri Jun 06 20:48:13 2008 +0000 +++ b/libpurple/protocols/jabber/disco.c Fri Jun 06 21:10:16 2008 +0000 @@ -148,11 +148,10 @@ 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;
--- a/libpurple/protocols/jabber/jabber.c Fri Jun 06 20:48:13 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.c Fri Jun 06 21:10:16 2008 +0000 @@ -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 @@ 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;