cpw.maiku.media_refactor: eb4d99b3: Move new stream emission back to media.c

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: eb4d99b323c58cb833e2499561a7cab8afed0d92
Ancestor: 7cb8ef8a9c5ff7bc90ee9eef93540c25bc5a4ab0
Author: maiku at pidgin.im
Date: 2009-10-28T18:36:18
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/eb4d99b323c58cb833e2499561a7cab8afed0d92

Modified files:
        libpurple/media/backend-fs2.c libpurple/media/media.c

ChangeLog: 

Move new stream emission back to media.c

-------------- next part --------------
============================================================
--- libpurple/media/backend-fs2.c	062eb404ce9acbdd94bcf8b73bcccb3ed2943859
+++ libpurple/media/backend-fs2.c	5b797b6eb3f8501d3a607ead7603c2aa507ca100
@@ -1468,9 +1468,6 @@ _create_participant(PurpleMediaBackendFs
 
 	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;
 }
 
============================================================
--- libpurple/media/media.c	c9e4c5a2c15be6c485355c450677401dabadd94e
+++ libpurple/media/media.c	3d6284acb5f2327e2f8231238b74b1ba537ff31b
@@ -1033,6 +1033,15 @@ purple_media_add_stream(PurpleMedia *med
 				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);