[telepathy-gabble/master] Wait for CALL_STATE_PENDING_RECEIVER before sending session-initiate.
Mike Ruprecht
mike.ruprecht at collabora.co.uk
Mon Dec 28 17:36:21 PST 2009
---
src/jingle-session.c | 6 ++++++
src/media-channel.c | 4 ++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/jingle-session.c b/src/jingle-session.c
index f3247b5..918db0b 100644
--- a/src/jingle-session.c
+++ b/src/jingle-session.c
@@ -1832,6 +1832,12 @@ try_session_initiate_or_accept (GabbleJingleSession *sess)
return;
}
+ if (!priv->locally_accepted)
+ {
+ DEBUG ("session not locally accepted yet, not initiating");
+ return;
+ }
+
action = JINGLE_ACTION_SESSION_INITIATE;
new_state = JS_STATE_PENDING_INITIATE_SENT;
handler = _on_initiate_reply;
diff --git a/src/media-channel.c b/src/media-channel.c
index 7d048fd..0701a03 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -1828,6 +1828,10 @@ media_channel_request_streams (GabbleMediaChannel *self,
priv->pending_stream_requests = g_list_prepend (priv->pending_stream_requests,
psr);
g_ptr_array_free (contents, TRUE);
+
+ /* signal acceptance */
+ gabble_jingle_session_accept (priv->session);
+
return;
error:
--
1.5.6.5
More information about the telepathy-commits
mailing list