[telepathy-gabble/master] Bump Jingle namespaces

Will Thompson will.thompson at collabora.co.uk
Thu Jun 25 05:45:58 PDT 2009


This will not break backwards compatibility with older Gabbles, since
they will just fall back to the v0.15 draft of Jingle.
---
 src/namespaces.h    |    7 ++++---
 tests/twisted/ns.py |    5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/namespaces.h b/src/namespaces.h
index 2f8b292..e64f60e 100644
--- a/src/namespaces.h
+++ b/src/namespaces.h
@@ -52,12 +52,13 @@
 #define NS_JINGLE_DESCRIPTION_VIDEO \
   "http://jabber.org/protocol/jingle/description/video"
 
-/* XEP-0166 draft v0.32 (last call) */
-#define NS_JINGLE032            "urn:xmpp:jingle:0"
+/* XEP-0166 draft */
+#define NS_JINGLE032            "urn:xmpp:jingle:1"
 #define NS_JINGLE_ERRORS        "urn:xmpp:jingle:errors:1"
 
 /* XEP-0167 (Jingle RTP) */
-#define NS_JINGLE_RTP           "urn:xmpp:jingle:apps:rtp:0"
+#define NS_JINGLE_RTP           "urn:xmpp:jingle:apps:rtp:1"
+#define NS_JINGLE_RTP_ERRORS    "urn:xmpp:jingle:apps:rtp:errors:1"
 #define NS_JINGLE_RTP_INFO      "urn:xmpp:jingle:apps:rtp:info:1"
 
 /* Google's Jingle dialect */
diff --git a/tests/twisted/ns.py b/tests/twisted/ns.py
index 36c2378..c991211 100644
--- a/tests/twisted/ns.py
+++ b/tests/twisted/ns.py
@@ -19,8 +19,9 @@ IBB = 'http://jabber.org/protocol/ibb'
 JINGLE_015 = "http://jabber.org/protocol/jingle"
 JINGLE_015_AUDIO = "http://jabber.org/protocol/jingle/description/audio"
 JINGLE_015_VIDEO = "http://jabber.org/protocol/jingle/description/video"
-JINGLE = "urn:xmpp:jingle:0"
-JINGLE_RTP = "urn:xmpp:jingle:apps:rtp:0"
+JINGLE = "urn:xmpp:jingle:1"
+JINGLE_RTP = "urn:xmpp:jingle:apps:rtp:1"
+JINGLE_RTP_ERRORS = "urn:xmpp:jingle:apps:rtp:errors:1"
 JINGLE_RTP_INFO_1 = "urn:xmpp:jingle:apps:rtp:info:1"
 MUC = 'http://jabber.org/protocol/muc'
 MUC_BYTESTREAM = 'http://telepathy.freedesktop.org/xmpp/protocol/muc-bytestream'
-- 
1.5.6.5




More information about the telepathy-commits mailing list