[telepathy-gabble/master] gabble_media_factory_add_caps: don't say we support Jingle transports unless we support a Jingle content-type too

[Simon McVittie]

---
 src/media-factory.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/media-factory.c b/src/media-factory.c
index a0dc0cc..35dfc45 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -684,6 +684,8 @@ gabble_media_factory_add_caps (GabbleCapabilitySet *caps,
     gboolean ice_udp,
     gboolean h264)
 {
+  gboolean any_content = audio || video;
+
   DEBUG ("Client %s media capabilities:%s%s%s%s%s",
       client_name,
       audio ? " audio" : "",
@@ -692,10 +694,10 @@ gabble_media_factory_add_caps (GabbleCapabilitySet *caps,
       ice_udp ? " ice-udp" : "",
       h264 ? " H.264" : "");
 
-  if (gtalk_p2p)
+  if (gtalk_p2p && any_content)
     gabble_capability_set_add (caps, NS_GOOGLE_TRANSPORT_P2P);
 
-  if (ice_udp)
+  if (ice_udp && any_content)
     gabble_capability_set_add (caps, NS_JINGLE_TRANSPORT_ICEUDP);
 
   if (audio)
-- 
1.5.6.5