[telepathy-gabble/master] Advertise rtp:{audio, video} caps where appropriate

[Will Thompson]

---
 src/capabilities.c  |    4 +++-
 src/media-channel.c |    6 ++++--
 src/namespaces.h    |    2 ++
 src/types.h         |    2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/capabilities.c b/src/capabilities.c
index 643b0d3..daba292 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -56,7 +56,9 @@ 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_JINGLE_RTP, PRESENCE_CAP_JINGLE_RTP },
+  { FEATURE_OPTIONAL, NS_JINGLE_RTP_AUDIO, PRESENCE_CAP_JINGLE_RTP_AUDIO },
+  { FEATURE_OPTIONAL, NS_JINGLE_RTP_VIDEO, PRESENCE_CAP_JINGLE_RTP_VIDEO },
   { FEATURE_OPTIONAL, NS_JINGLE_TRANSPORT_ICE,
       PRESENCE_CAP_JINGLE_TRANSPORT_ICE },
   { FEATURE_OPTIONAL, NS_JINGLE_TRANSPORT_RAWUDP,
diff --git a/src/media-channel.c b/src/media-channel.c
index 231c3c3..3e402bb 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -2501,10 +2501,12 @@ stream_direction_changed_cb (GabbleMediaStream *stream,
   | PRESENCE_CAP_GOOGLE_TRANSPORT_P2P )
 
 #define JINGLE_AUDIO_CAPS \
-  ( PRESENCE_CAP_JINGLE_RTP | PRESENCE_CAP_JINGLE_DESCRIPTION_AUDIO )
+  ( PRESENCE_CAP_JINGLE_RTP | PRESENCE_CAP_JINGLE_RTP_AUDIO \
+  | PRESENCE_CAP_JINGLE_DESCRIPTION_AUDIO )
 
 #define JINGLE_VIDEO_CAPS \
-  ( PRESENCE_CAP_JINGLE_RTP | PRESENCE_CAP_JINGLE_DESCRIPTION_VIDEO )
+  ( PRESENCE_CAP_JINGLE_RTP | PRESENCE_CAP_JINGLE_RTP_VIDEO \
+  | PRESENCE_CAP_JINGLE_DESCRIPTION_VIDEO )
 
 GabblePresenceCapabilities
 _gabble_media_channel_typeflags_to_caps (TpChannelMediaCapabilities flags)
diff --git a/src/namespaces.h b/src/namespaces.h
index e64f60e..5bb6fad 100644
--- a/src/namespaces.h
+++ b/src/namespaces.h
@@ -60,6 +60,8 @@
 #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"
+#define NS_JINGLE_RTP_AUDIO     "urn:xmpp:jingle:apps:rtp:audio"
+#define NS_JINGLE_RTP_VIDEO     "urn:xmpp:jingle:apps:rtp:video"
 
 /* Google's Jingle dialect */
 #define NS_GOOGLE_SESSION       "http://www.google.com/session"
diff --git a/src/types.h b/src/types.h
index 1062b03..864473d 100644
--- a/src/types.h
+++ b/src/types.h
@@ -78,6 +78,8 @@ typedef enum {
     PRESENCE_CAP_SI_FILE_TRANSFER = 1 << 17,
     PRESENCE_CAP_JINGLE_OMITS_CONTENT_CREATOR = 1 << 18,
     PRESENCE_CAP_GOOGLE_VIDEO = 1 << 19,
+    PRESENCE_CAP_JINGLE_RTP_AUDIO = 1 << 20,
+    PRESENCE_CAP_JINGLE_RTP_VIDEO = 1 << 21,
 } GabblePresenceCapabilities;
 
 G_END_DECLS
-- 
1.5.6.5