[Telepathy-commits] [telepathy-gabble/master] Emit SetStreamSending(True) when accepting incoming streams.

Will Thompson will.thompson at collabora.co.uk
Wed Feb 25 12:21:49 PST 2009


This makes accepting streams the other side initiates after the call's
been accepted work.
---
 src/media-stream.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/media-stream.c b/src/media-stream.c
index f6c8422..5b4e454 100644
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -1439,8 +1439,20 @@ gabble_media_stream_change_direction (GabbleMediaStream *stream,
   new_combined_dir = MAKE_COMBINED_DIRECTION (requested_dir, pending_send);
   if (new_combined_dir != stream->combined_direction)
     {
+      JingleContentState state;
+      gboolean start_sending;
+
       g_object_set (stream, "combined-direction", new_combined_dir, NULL);
-      update_sending (stream, FALSE);
+
+      /* We would like to emit SetStreamSending(True) (if appropriate) only if:
+       *  - the content was locally created, or
+       *  - the user explicitly okayed the content.
+       * This appears to be the meaning of Acknowledged. :-)
+       */
+      g_object_get (stream->priv->content, "state", &state, NULL);
+      start_sending = (state == JINGLE_CONTENT_STATE_ACKNOWLEDGED);
+
+      update_sending (stream, start_sending);
     }
 
   /* short-circuit sending a request if we're not asking for anything new */
-- 
1.5.6.5




More information about the telepathy-commits mailing list