[telepathy-gabble/master] Correctly retransmit candidates for each content.
Will Thompson
will.thompson at collabora.co.uk
Wed Jul 29 16:31:16 PDT 2009
c was not initialized by the time this
gabble_jingle_content_retransmit_candidates () was called. The fact that
we've not seen this crash suggests that this code path isn't reached in
practice.
---
src/jingle-session.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/jingle-session.c b/src/jingle-session.c
index 54a3e37..e94194c 100644
--- a/src/jingle-session.c
+++ b/src/jingle-session.c
@@ -1321,9 +1321,16 @@ on_transport_info (GabbleJingleSession *sess, LmMessageNode *node,
if (!tp_strdiff (lm_message_node_get_attribute (node, "type"),
"candidates"))
{
+ GList *contents = gabble_jingle_session_get_contents (sess);
+ GList *l;
+
DEBUG ("switching to gtalk3 dialect and retransmiting our candidates");
priv->dialect = JINGLE_DIALECT_GTALK3;
- gabble_jingle_content_retransmit_candidates (c, TRUE);
+
+ for (l = contents; l != NULL; l = l->next)
+ gabble_jingle_content_retransmit_candidates (l->data, TRUE);
+
+ g_list_free (contents);
}
else
{
--
1.5.6.5
More information about the telepathy-commits
mailing list