Move new stream emission back to media.c

2 files changed, 9 insertions, 3 deletions

diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
index 38d40201da..94bae684f6 100644
--- a/libpurple/media/backend-fs2.c
+++ b/libpurple/media/backend-fs2.c
@@ -1468,9 +1468,6 @@ _create_participant(PurpleMediaBackendFs2 *self, const gchar *name)
 
 	g_hash_table_insert(priv->participants, g_strdup(name), participant);
 
-	g_signal_emit_by_name(priv->media, "state-changed",
-			PURPLE_MEDIA_STATE_NEW, NULL, name);
-
 	return TRUE;
 }
 
diff --git a/libpurple/media/media.c b/libpurple/media/media.c
index 3e36c578a9..042639792b 100644
--- a/libpurple/media/media.c
+++ b/libpurple/media/media.c
@@ -1033,6 +1033,15 @@ purple_media_add_stream(PurpleMedia *media, const gchar *sess_id,
 				session->id, NULL);
 	}
 
+	if (!g_list_find_custom(media->priv->participants,
+			who, (GCompareFunc)strcmp)) {
+		media->priv->participants = g_list_prepend(
+				media->priv->participants, g_strdup(who));
+
+		g_signal_emit_by_name(media, "state-changed",
+				PURPLE_MEDIA_STATE_NEW, NULL, who);
+	}
+
 	if (purple_media_get_stream(media, sess_id, who) == NULL) {
 		stream = purple_media_insert_stream(session, who, initiator);