cpw.maiku.media_refactor: 7d0d6870: Remove FsStream from PurpleMedia stream.

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: 7d0d6870bab97255083c659a52423232152298c3
Ancestor: 089fd476793edafc58e0e23a0c1a8b8ffec965eb
Author: maiku at pidgin.im
Date: 2009-10-27T18:42:01
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/7d0d6870bab97255083c659a52423232152298c3

Modified files:
        libpurple/media/media.c

ChangeLog: 

Remove FsStream from PurpleMedia stream.

-------------- next part --------------
============================================================
--- libpurple/media/media.c	dd3315cecca4db02ba77485f1e354d5434148b69
+++ libpurple/media/media.c	5dd0932df591eae15596f09dc327ca48627151ef
@@ -85,7 +85,6 @@ struct _PurpleMediaStream
 {
 	PurpleMediaSession *session;
 	gchar *participant;
-	FsStream *stream;
 	GstElement *src;
 	GstElement *tee;
 	GstElement *volume;
@@ -618,16 +617,17 @@ static PurpleMediaStream *
 #endif
 
 static PurpleMediaStream *
-purple_media_insert_stream(PurpleMediaSession *session, const gchar *name, FsStream *stream)
+purple_media_insert_stream(PurpleMediaSession *session,
+		const gchar *name, gboolean initiator)
 {
 	PurpleMediaStream *media_stream;
 	
 	g_return_val_if_fail(session != NULL, NULL);
 
 	media_stream = g_new0(PurpleMediaStream, 1);
-	media_stream->stream = stream;
 	media_stream->participant = g_strdup(name);
 	media_stream->session = session;
+	media_stream->initiator = initiator;
 
 	session->media->priv->streams =
 			g_list_append(session->media->priv->streams, media_stream);
@@ -1237,8 +1237,7 @@ purple_media_add_stream(PurpleMedia *med
 				PURPLE_MEDIA_BACKEND_FS2(
 				media->priv->backend), sess_id, who);
 
-		stream = purple_media_insert_stream(session, who, fsstream);
-		stream->initiator = initiator;
+		stream = purple_media_insert_stream(session, who, initiator);
 
 		/* callback for source pad added (new stream source ready) */
 		g_signal_connect(G_OBJECT(fsstream),