[telepathy-gabble/master] Recognize clients as media capable if they have any supported transport

Sjoerd Simons sjoerd.simons at collabora.co.uk
Mon Sep 28 03:06:04 PDT 2009


Before gabble would only regard a client as audio and/or video capable when it
support Google p2p as a transport. For jingle clients it's ofcouse entirely
valid to not support Google p2p.

Allow clients to be marked as media capable if they support any of our
supported protocol (they still need to also advertise jingle/gtalk capabilities
seperatly. This is correct as we support all our transports as part of a normal
jingle session and for the google protocol it's not necessary to advertise a
transport.
---
 src/media-factory.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/media-factory.c b/src/media-factory.c
index 5b5e635..ecbfa89 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -731,9 +731,8 @@ _gabble_media_factory_caps_to_typeflags (const GabbleCapabilitySet *caps)
   TpChannelMediaCapabilities typeflags = 0;
   gboolean has_a_transport;
 
-  /* FIXME: shouldn't we support audio/video for people with any transport
-   * that we ourselves support, not just gtalk-p2p? */
-  has_a_transport = gabble_capability_set_has (caps, NS_GOOGLE_TRANSPORT_P2P);
+  has_a_transport = gabble_capability_set_has_one (caps,
+    gabble_capabilities_get_any_transport ());
 
   if (has_a_transport &&
       gabble_capability_set_has_one (caps,
-- 
1.5.6.5




More information about the telepathy-commits mailing list