[Telepathy-commits] [telepathy-gabble/master] Set direction for locally-created streams in MediaStream, not MediaChannel

[Simon McVittie]

---
 src/media-channel.c |    7 -------
 src/media-stream.c  |    7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/media-channel.c b/src/media-channel.c
index 83a2001..9a67f8f 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -2371,13 +2371,6 @@ create_stream_from_content (GabbleMediaChannel *chan, GabbleJingleContent *c)
       nat_traversal, locally_created);
   g_free (nat_traversal);
 
-  if (locally_created)
-    {
-      g_object_set (stream, "combined-direction",
-          MAKE_COMBINED_DIRECTION (TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL,
-            0), NULL);
-    }
-
   DEBUG ("%p: created new MediaStream %p for content '%s'", chan, stream, name);
 
   g_ptr_array_add (priv->streams, stream);
diff --git a/src/media-stream.c b/src/media-stream.c
index 80a65cd..2d179c7 100644
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -286,6 +286,13 @@ gabble_media_stream_constructor (GType type, guint n_props,
   priv->initial_getter_id =
       g_idle_add (_get_initial_codecs_and_candidates, stream);
 
+  if (priv->created_locally)
+    {
+      g_object_set (stream, "combined-direction",
+          MAKE_COMBINED_DIRECTION (TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL,
+            0), NULL);
+    }
+
   return obj;
 }
 
-- 
1.5.6.5