cpw.maiku.media_refactor: 40c9cf3b: Remove references to FsStream in PurpleM...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: 40c9cf3bf47c7ab1637273e778260fe18114e9a6
Ancestor: 0468b8aa24e89562c3f2d86f86fefa7f1db6b053
Author: maiku at pidgin.im
Date: 2009-10-27T21:46:44
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/40c9cf3bf47c7ab1637273e778260fe18114e9a6

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

ChangeLog: 

Remove references to FsStream in PurpleMedia.

-------------- next part --------------
============================================================
--- libpurple/media/backend-fs2.c	95a0ee0a2834399f89baffb2c919f030f3162473
+++ libpurple/media/backend-fs2.c	47248f642209ecec8cf532d0a18c217ae69700ab
@@ -1949,15 +1949,6 @@ purple_media_backend_fs2_set_send_codec(
 	return TRUE;
 }
 
-FsStream *
-purple_media_backend_fs2_get_stream(PurpleMediaBackendFs2 *self,
-		const gchar *sess_id, const gchar *who)
-{
-	PurpleMediaBackendFs2Stream *stream =
-			_get_stream(self, sess_id, who);
-	return stream != NULL? stream->stream : NULL;
-}
-
 GstElement *
 purple_media_backend_fs2_get_src(PurpleMediaBackendFs2 *self,
 		const gchar *sess_id)
============================================================
--- libpurple/media/backend-fs2.h	e5e62bacaa45879b4dc367ee796935a29f93d8d9
+++ libpurple/media/backend-fs2.h	981dbbbe62ab919d049c4f2fd6ed5f7ead69b23c
@@ -59,10 +59,7 @@ GType purple_media_backend_fs2_get_type(
  * Temporary function in order to be able to test while
  * integrating with PurpleMedia
  */
-#include <gst/farsight/fs-conference-iface.h>
-FsStream *purple_media_backend_fs2_get_stream(
-		PurpleMediaBackendFs2 *self,
-		const gchar *sess_id, const gchar *who);
+#include <gst/gst.h>
 GstElement *purple_media_backend_fs2_get_src(
 		PurpleMediaBackendFs2 *self,
 		const gchar *sess_id);
============================================================
--- libpurple/media/media.c	0cb2693adaed82bf09153d1330df7fac788e4fa8
+++ libpurple/media/media.c	14815600c0021daf7b3a6996ee50e0e3d38248b8
@@ -837,12 +837,6 @@ purple_media_add_stream(PurpleMedia *med
 	}
 
 	if (purple_media_get_stream(media, sess_id, who) == NULL) {
-		FsStream *fsstream = NULL;
-
-		fsstream = purple_media_backend_fs2_get_stream(
-				PURPLE_MEDIA_BACKEND_FS2(
-				media->priv->backend), sess_id, who);
-
 		stream = purple_media_insert_stream(session, who, initiator);
 
 		g_signal_emit(media, purple_media_signals[STATE_CHANGED],