# HG changeset patch # User maiku@pidgin.im # Date 1256668921 0 # Node ID 7e9d8840e97f90384de13900cdae24bfce7ad1ed # Parent f65689100cfec05cb5d415e84eb51f3133bb58b1 Remove FsStream from PurpleMedia stream. diff -r f65689100cfe -r 7e9d8840e97f libpurple/media/media.c --- 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),