diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2013-06-27 15:40:00 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2013-06-27 15:40:00 +0100 |
| commit | c0e8186ae66964bf16ff6bc3c8b6d08f26077adb (patch) | |
| tree | f3b13607a596ac0960ea48653f706c58ebb80b13 | |
| parent | 58b7e9474a197233b58c2a400eda375d6308e5a4 (diff) | |
Revert "Jingle: wait for session-initiate ack, then send candidates"
This reverts commit d8fcf78cf9bbad0b822b3368479cea532f11dc83.
I didn't mean to merge this patch, since it is still pending the
testing/checking Simon mentions on
<https://bugs.freedesktop.org/show_bug.cgi?id=65657#c2>. But I guess it
was locally applied when I merged Tobias' patch.
| -rw-r--r-- | wocky/wocky-jingle-session.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wocky/wocky-jingle-session.c b/wocky/wocky-jingle-session.c index eea37ab..02a96b1 100644 --- a/wocky/wocky-jingle-session.c +++ b/wocky/wocky-jingle-session.c @@ -1921,9 +1921,6 @@ _on_initiate_reply ( priv->remote_ringing = TRUE; g_signal_emit (sess, signals[REMOTE_STATE_CHANGED], 0); } - - /* now all initial contents can transmit their candidates */ - _map_initial_contents (sess, _transmit_candidates, NULL); } else { @@ -2078,6 +2075,9 @@ try_session_initiate_or_accept (WockyJingleSession *sess) msg, NULL, handler, g_object_ref (sess)); g_object_unref (msg); set_state (sess, new_state, 0, NULL); + + /* now all initial contents can transmit their candidates */ + _map_initial_contents (sess, _transmit_candidates, NULL); } /** |