[Telepathy-commits] [telepathy-gabble/master] Update namespaces for the current Jingle version

[Senko Rasic]

---
 src/jingle-factory.h |    2 +-
 src/jingle-session.c |    6 +++---
 src/media-channel.c  |    2 +-
 src/namespaces.h     |    5 ++---
 src/presence-cache.c |    2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/jingle-factory.h b/src/jingle-factory.h
index 8083b7d..ca2aa74 100644
--- a/src/jingle-factory.h
+++ b/src/jingle-factory.h
@@ -38,7 +38,7 @@ typedef enum {
   /* jingle in the old 0.15 version days */
   JINGLE_DIALECT_V015,
   /* current jingle standard */
-  JINGLE_DIALECT_V026
+  JINGLE_DIALECT_V032
 } JingleDialect;
 
 typedef enum {
diff --git a/src/jingle-session.c b/src/jingle-session.c
index 460d7f9..1808d20 100644
--- a/src/jingle-session.c
+++ b/src/jingle-session.c
@@ -883,11 +883,11 @@ gabble_jingle_session_parse (GabbleJingleSession *sess, LmMessage *message, GErr
 
   /* first, we try standard jingle */
   session_node = lm_message_node_get_child_with_namespace (iq_node,
-      "jingle", NS_JINGLE026);
+      "jingle", NS_JINGLE032);
 
   if (session_node != NULL)
     {
-      dialect = JINGLE_DIALECT_V026;
+      dialect = JINGLE_DIALECT_V032;
     }
   else
     {
@@ -1095,7 +1095,7 @@ gabble_jingle_session_new_message (GabbleJingleSession *sess,
         g_assert_not_reached ();
       default:
         el = "jingle";
-        ns = NS_JINGLE026;
+        ns = NS_JINGLE032;
         break;
     }
 
diff --git a/src/media-channel.c b/src/media-channel.c
index ac91010..e37b8f6 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -1192,7 +1192,7 @@ _pick_best_resource (GabbleMediaChannel *chan,
 
   if (resource != NULL)
     {
-      *dialect = JINGLE_DIALECT_V026;
+      *dialect = JINGLE_DIALECT_V032;
       goto CHOOSE_TRANSPORT;
     }
 
diff --git a/src/namespaces.h b/src/namespaces.h
index d8853e3..e6b90d6 100644
--- a/src/namespaces.h
+++ b/src/namespaces.h
@@ -75,12 +75,11 @@
 #define NS_XMPP_STANZAS         "urn:ietf:params:xml:ns:xmpp-stanzas"
 
 #define NS_JINGLE015            "http://jabber.org/protocol/jingle"
-#define NS_JINGLE026            "urn:xmpp:tmp:jingle"
+#define NS_JINGLE032            "urn:xmpp:jingle:0"
 #define NS_GOOGLE_SESSION       "http://www.google.com/session"
 #define NS_GOOGLE_SESSION_PHONE "http://www.google.com/session/phone"
 #define NS_GOOGLE_TRANSPORT_P2P "http://www.google.com/transport/p2p"
-#define NS_JINGLE_TMP           "urn:xmpp:tmp:jingle"
-#define NS_JINGLE_RTP_TMP       "urn:xmpp:tmp:jingle:apps:rtp"
+#define NS_JINGLE_RTP_TMP       "urn:xmpp:jingle:apps:rtp:0"
 #define NS_JINGLE_TRANSPORT_RAWUDP \
   "http://jabber.org/protocol/jingle/transport/rawudp"
 
diff --git a/src/presence-cache.c b/src/presence-cache.c
index 2b8c346..1b884ef 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -803,7 +803,7 @@ _caps_disco_cb (GabbleDisco *disco,
         caps |= PRESENCE_CAP_OLPC_1;
       else if (!tp_strdiff (var, NS_JINGLE_RTP_TMP))
         caps |= PRESENCE_CAP_JINGLE_RTP_TMP;
-      else if (!tp_strdiff (var, NS_JINGLE_TMP))
+      else if (!tp_strdiff (var, NS_JINGLE032))
         caps |= PRESENCE_CAP_JINGLE_TMP;
       else if (!tp_strdiff (var, NS_JINGLE_TRANSPORT_ICE))
         caps |= PRESENCE_CAP_JINGLE_TRANSPORT_ICE;
-- 
1.5.6.5