[Telepathy-commits] [telepathy-gabble/master] renamed Jingle capabilities and namespaces to make them more consistent
Senko Rasic
senko at phyrexia.lan
Tue Dec 2 04:34:03 PST 2008
---
src/capabilities.c | 4 +++-
src/jingle-media-rtp.c | 4 ++--
src/media-channel.c | 10 +++++-----
src/namespaces.h | 27 ++++++++++++++++++---------
src/presence-cache.c | 10 +++++-----
src/types.h | 6 +++---
6 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/src/capabilities.c b/src/capabilities.c
index 459e153..a0b02e3 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -30,7 +30,8 @@ static const Feature self_advertised_features[] =
{
{ FEATURE_FIXED, NS_GOOGLE_FEAT_SESSION, 0},
{ FEATURE_FIXED, NS_GOOGLE_TRANSPORT_P2P, PRESENCE_CAP_GOOGLE_TRANSPORT_P2P},
- { FEATURE_FIXED, NS_JINGLE, PRESENCE_CAP_JINGLE},
+ { FEATURE_FIXED, NS_JINGLE015, PRESENCE_CAP_JINGLE015},
+ { FEATURE_FIXED, NS_JINGLE032, PRESENCE_CAP_JINGLE032},
{ FEATURE_FIXED, NS_CHAT_STATES, PRESENCE_CAP_CHAT_STATES},
{ FEATURE_FIXED, NS_NICK, 0},
{ FEATURE_FIXED, NS_NICK "+notify", 0},
@@ -43,6 +44,7 @@ static const Feature self_advertised_features[] =
PRESENCE_CAP_JINGLE_DESCRIPTION_AUDIO},
{ FEATURE_OPTIONAL, NS_JINGLE_DESCRIPTION_VIDEO,
PRESENCE_CAP_JINGLE_DESCRIPTION_VIDEO},
+ { FEATURE_OPTIONAL, NS_JINGLE_RTP, PRESENCE_CAP_JINGLE_RTP},
{ FEATURE_OPTIONAL, NS_OLPC_BUDDY_PROPS "+notify", PRESENCE_CAP_OLPC_1},
{ FEATURE_OPTIONAL, NS_OLPC_ACTIVITIES "+notify", PRESENCE_CAP_OLPC_1},
diff --git a/src/jingle-media-rtp.c b/src/jingle-media-rtp.c
index d38edda..4dc4e1d 100644
--- a/src/jingle-media-rtp.c
+++ b/src/jingle-media-rtp.c
@@ -217,7 +217,7 @@ parse_description (GabbleJingleContent *content,
GList *codecs = NULL;
LmMessageNode *node;
- if (lm_message_node_has_namespace (desc_node, NS_JINGLE_RTP_TMP, NULL))
+ if (lm_message_node_has_namespace (desc_node, NS_JINGLE_RTP, NULL))
{
const gchar *type = lm_message_node_get_attribute (desc_node, "media");
@@ -454,7 +454,7 @@ jingle_media_rtp_register (GabbleJingleFactory *factory)
{
/* Current (v0.25) Jingle draft URI */
gabble_jingle_factory_register_content_type (factory,
- NS_JINGLE_RTP_TMP, GABBLE_TYPE_JINGLE_MEDIA_RTP);
+ NS_JINGLE_RTP, GABBLE_TYPE_JINGLE_MEDIA_RTP);
/* Old Jingle audio/video namespaces */
gabble_jingle_factory_register_content_type (factory,
diff --git a/src/media-channel.c b/src/media-channel.c
index 5d83b5c..d6aec1b 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -1139,9 +1139,9 @@ _pick_best_content_type (GabbleMediaChannel *chan, TpHandle peer,
presence = gabble_presence_cache_get (priv->conn->presence_cache, peer);
if (gabble_presence_resource_has_caps (presence, resource,
- PRESENCE_CAP_JINGLE_RTP_TMP))
+ PRESENCE_CAP_JINGLE_RTP))
{
- return NS_JINGLE_RTP_TMP;
+ return NS_JINGLE_RTP;
}
if ((type == JINGLE_MEDIA_TYPE_VIDEO) &&
@@ -1186,7 +1186,7 @@ _pick_best_resource (GabbleMediaChannel *chan,
g_return_val_if_fail (want_audio || want_video, NULL);
/* Try newest Jingle standard */
- caps = PRESENCE_CAP_JINGLE_RTP_TMP;
+ caps = PRESENCE_CAP_JINGLE_RTP;
resource = gabble_presence_pick_resource_by_caps (presence, caps);
if (resource != NULL)
@@ -1524,7 +1524,7 @@ contact_is_media_capable (GabbleMediaChannel *chan, TpHandle peer)
conn, TP_HANDLE_TYPE_CONTACT);
GabblePresenceCapabilities caps;
- caps = PRESENCE_CAP_GOOGLE_VOICE | PRESENCE_CAP_JINGLE_RTP_TMP |
+ caps = PRESENCE_CAP_GOOGLE_VOICE | PRESENCE_CAP_JINGLE_RTP |
PRESENCE_CAP_JINGLE_DESCRIPTION_AUDIO | PRESENCE_CAP_JINGLE_DESCRIPTION_VIDEO;
presence = gabble_presence_cache_get (priv->conn->presence_cache, peer);
@@ -2096,7 +2096,7 @@ stream_direction_changed_cb (GabbleMediaStream *stream,
( PRESENCE_CAP_GOOGLE_VOICE )
#define JINGLE_CAPS \
- ( PRESENCE_CAP_JINGLE \
+ ( PRESENCE_CAP_JINGLE015 \
| PRESENCE_CAP_GOOGLE_TRANSPORT_P2P )
#define JINGLE_AUDIO_CAPS \
diff --git a/src/namespaces.h b/src/namespaces.h
index e6b90d6..f122bf3 100644
--- a/src/namespaces.h
+++ b/src/namespaces.h
@@ -39,14 +39,31 @@
#define NS_GOOGLE_SESSION_PHONE "http://www.google.com/session/phone"
#define NS_GOOGLE_TRANSPORT_P2P "http://www.google.com/transport/p2p"
#define NS_IBB "http://jabber.org/protocol/ibb"
-#define NS_JINGLE "http://jabber.org/protocol/jingle"
+/* XEP-0166 draft v0.15 */
+#define NS_JINGLE015 "http://jabber.org/protocol/jingle"
+/* XEP-0166 draft v0.32 (last call) */
+#define NS_JINGLE032 "urn:xmpp:jingle:0"
+/* Google's Jingle dialect */
+#define NS_GOOGLE_SESSION "http://www.google.com/session"
+/* Audio capability in Google Jingle dialect */
+#define NS_GOOGLE_SESSION_PHONE "http://www.google.com/session/phone"
+/* XEP-0167 (Jingle RTP) */
+#define NS_JINGLE_RTP "urn:xmpp:jingle:apps:rtp:0"
+/* RTP audio capability in Jingle v0.15 */
#define NS_JINGLE_DESCRIPTION_AUDIO \
"http://jabber.org/protocol/jingle/description/audio"
+/* RTP video capability in Jingle v0.15 */
#define NS_JINGLE_DESCRIPTION_VIDEO \
"http://jabber.org/protocol/jingle/description/video"
#define NS_JINGLE_ERRORS "http://jabber.org/protocol/jingle#errors"
+/* Jingle ICE-UDP transport */
#define NS_JINGLE_TRANSPORT_ICE \
"http://jabber.org/protocol/jingle/transport/ice"
+/* google-p2p transport */
+#define NS_GOOGLE_TRANSPORT_P2P "http://www.google.com/transport/p2p"
+/* Jingle RAW-UDP transport */
+#define NS_JINGLE_TRANSPORT_RAWUDP \
+ "http://jabber.org/protocol/jingle/transport/rawudp"
#define NS_MUC "http://jabber.org/protocol/muc"
#define NS_MUC_BYTESTREAM "http://telepathy.freedesktop.org/xmpp/protocol/muc-bytestream"
#define NS_MUC_USER "http://jabber.org/protocol/muc#user"
@@ -74,13 +91,5 @@
#define NS_X_CONFERENCE "jabber:x:conference"
#define NS_XMPP_STANZAS "urn:ietf:params:xml:ns:xmpp-stanzas"
-#define NS_JINGLE015 "http://jabber.org/protocol/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_RTP_TMP "urn:xmpp:jingle:apps:rtp:0"
-#define NS_JINGLE_TRANSPORT_RAWUDP \
- "http://jabber.org/protocol/jingle/transport/rawudp"
#endif /* __GABBLE_NAMESPACES__H__ */
diff --git a/src/presence-cache.c b/src/presence-cache.c
index 9b249cc..b5018cc 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -780,8 +780,8 @@ _caps_disco_cb (GabbleDisco *disco,
caps |= PRESENCE_CAP_GOOGLE_TRANSPORT_P2P;
else if (0 == strcmp (var, NS_GOOGLE_FEAT_VOICE))
caps |= PRESENCE_CAP_GOOGLE_VOICE;
- else if (0 == strcmp (var, NS_JINGLE))
- caps |= PRESENCE_CAP_JINGLE;
+ else if (0 == strcmp (var, NS_JINGLE015))
+ caps |= PRESENCE_CAP_JINGLE015;
else if (0 == strcmp (var, NS_JINGLE_DESCRIPTION_AUDIO))
caps |= PRESENCE_CAP_JINGLE_DESCRIPTION_AUDIO;
else if (0 == strcmp (var, NS_JINGLE_DESCRIPTION_VIDEO))
@@ -801,10 +801,10 @@ _caps_disco_cb (GabbleDisco *disco,
!tp_strdiff (var, NS_OLPC_CURRENT_ACTIVITY "+notify") ||
!tp_strdiff (var, NS_OLPC_ACTIVITY_PROPS "+notify"))
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_RTP))
+ caps |= PRESENCE_CAP_JINGLE_RTP;
else if (!tp_strdiff (var, NS_JINGLE032))
- caps |= PRESENCE_CAP_JINGLE_TMP;
+ caps |= PRESENCE_CAP_JINGLE032;
else if (!tp_strdiff (var, NS_JINGLE_TRANSPORT_ICE))
caps |= PRESENCE_CAP_JINGLE_TRANSPORT_ICE;
else if (!tp_strdiff (var, NS_JINGLE_TRANSPORT_RAWUDP))
diff --git a/src/types.h b/src/types.h
index d454141..6bfc321 100644
--- a/src/types.h
+++ b/src/types.h
@@ -61,7 +61,7 @@ typedef enum {
PRESENCE_CAP_NONE = 0,
PRESENCE_CAP_GOOGLE_TRANSPORT_P2P = 1 << 0,
PRESENCE_CAP_GOOGLE_VOICE = 1 << 1,
- PRESENCE_CAP_JINGLE = 1 << 2,
+ PRESENCE_CAP_JINGLE015 = 1 << 2,
PRESENCE_CAP_JINGLE_DESCRIPTION_AUDIO = 1 << 3,
PRESENCE_CAP_JINGLE_DESCRIPTION_VIDEO = 1 << 4,
PRESENCE_CAP_CHAT_STATES = 1 << 5,
@@ -71,8 +71,8 @@ typedef enum {
PRESENCE_CAP_SI_TUBES = 1 << 9,
PRESENCE_CAP_FILE_TRANSFER = 1 << 10,
PRESENCE_CAP_OLPC_1 = 1 << 11,
- PRESENCE_CAP_JINGLE_RTP_TMP = 1 << 12,
- PRESENCE_CAP_JINGLE_TMP = 1 << 13,
+ PRESENCE_CAP_JINGLE_RTP = 1 << 12,
+ PRESENCE_CAP_JINGLE032 = 1 << 13,
PRESENCE_CAP_JINGLE_TRANSPORT_ICE = 1 << 14,
PRESENCE_CAP_JINGLE_TRANSPORT_RAWUDP = 1 << 15,
} GabblePresenceCapabilities;
--
1.5.6.5
More information about the Telepathy-commits
mailing list