[telepathy-gabble/master] GabbleCallChannel, GabbleMediaChannel: improve debug for existing sessions

Simon McVittie simon.mcvittie at collabora.co.uk
Tue Jan 5 11:02:09 PST 2010


---
 src/call-channel.c  |   11 +++++++++--
 src/media-channel.c |    5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/call-channel.c b/src/call-channel.c
index b5e42f3..2fabd24 100644
--- a/src/call-channel.c
+++ b/src/call-channel.c
@@ -712,10 +712,17 @@ call_channel_create_content (GabbleCallChannel *self,
   GabbleCallChannelPrivate *priv = self->priv;
   const gchar *content_ns;
   GabbleJingleContent *c;
+  const gchar *peer_resource;
+
+  peer_resource = gabble_jingle_session_get_peer_resource (priv->session);
+
+  if (peer_resource[0] != '\0')
+    DEBUG ("existing call, using peer resource %s", peer_resource);
+  else
+    DEBUG ("existing call, using bare JID");
 
   content_ns = jingle_pick_best_content_type (priv->conn, priv->target,
-    gabble_jingle_session_get_peer_resource (priv->session),
-    type);
+    peer_resource, type);
 
   if (content_ns == NULL)
     {
diff --git a/src/media-channel.c b/src/media-channel.c
index 0701a03..42ab758 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -1538,6 +1538,11 @@ _gabble_media_channel_request_contents (GabbleMediaChannel *chan,
     {
       peer_resource = gabble_jingle_session_get_peer_resource (priv->session);
 
+      if (peer_resource[0] != '\0')
+        DEBUG ("existing call, using peer resource %s", peer_resource);
+      else
+        DEBUG ("existing call, using bare JID");
+
       /* is a google call... we have no other option */
       if (!gabble_jingle_session_can_modify_contents (priv->session))
         {
-- 
1.5.6.5




More information about the telepathy-commits mailing list