Mercurial > pidgin.yaz

changeset 29580:7e9d8840e97f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove FsStream from PurpleMedia stream.
author maiku@pidgin.im
date Tue, 27 Oct 2009 18:42:01 +0000
parents f65689100cfe
children f351e87b7af0
files libpurple/media/media.c
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/media/media.c	Tue Oct 27 18:34:46 2009 +0000
+++ b/libpurple/media/media.c	Tue Oct 27 18:42:01 2009 +0000
@@ -85,7 +85,6 @@
 {
 	PurpleMediaSession *session;
 	gchar *participant;
-	FsStream *stream;
 	GstElement *src;
 	GstElement *tee;
 	GstElement *volume;
@@ -618,16 +617,17 @@
 #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_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),