[Telepathy-commits] [telepathy-gabble/master] GabbleMediaChannel: don't tell stream whether it was locally created - it can ask the content

[Simon McVittie]

---
 src/media-channel.c |    4 +---
 src/media-stream.c  |    3 +--
 src/media-stream.h  |    2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/media-channel.c b/src/media-channel.c
index 9f754e5..acfdd4c 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -2338,11 +2338,9 @@ create_stream_from_content (GabbleMediaChannel *chan, GabbleJingleContent *c)
   guint id;
   gchar *object_path;
   gchar *nat_traversal;
-  gboolean locally_created;
 
   g_object_get (c,
       "name", &name,
-      "locally-created", &locally_created,
       NULL);
 
   if (G_OBJECT_TYPE (c) != GABBLE_TYPE_JINGLE_MEDIA_RTP)
@@ -2363,7 +2361,7 @@ create_stream_from_content (GabbleMediaChannel *chan, GabbleJingleContent *c)
       "nat-traversal", &nat_traversal,
       NULL);
   stream = gabble_media_stream_new (object_path, c, name, id,
-      nat_traversal, locally_created);
+      nat_traversal);
   g_free (nat_traversal);
 
   DEBUG ("%p: created new MediaStream %p for content '%s'", chan, stream, name);
diff --git a/src/media-stream.c b/src/media-stream.c
index 4c759fb..cf7b609 100644
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -157,8 +157,7 @@ gabble_media_stream_new (const gchar *object_path,
                          GabbleJingleContent *content,
                          const gchar *name,
                          guint id,
-                         const gchar *nat_traversal,
-                         gboolean created_locally)
+                         const gchar *nat_traversal)
 {
   g_return_val_if_fail (GABBLE_IS_JINGLE_MEDIA_RTP (content), NULL);
 
diff --git a/src/media-stream.h b/src/media-stream.h
index 68d9c85..59ef5f8 100644
--- a/src/media-stream.h
+++ b/src/media-stream.h
@@ -96,7 +96,7 @@ void gabble_media_stream_accept_pending_local_send (GabbleMediaStream *stream);
 
 GabbleMediaStream *gabble_media_stream_new (const gchar *object_path,
     GabbleJingleContent *content, const gchar *name, guint id,
-    const gchar *nat_traversal, gboolean created_locally);
+    const gchar *nat_traversal);
 TpMediaStreamType gabble_media_stream_get_media_type (GabbleMediaStream *self);
 
 G_END_DECLS
-- 
1.5.6.5