diff options
| author | Michael Ruprecht <maiku@pidgin.im> | 2009-10-27 21:46:44 +0000 |
|---|---|---|
| committer | Michael Ruprecht <maiku@pidgin.im> | 2009-10-27 21:46:44 +0000 |
| commit | fd783dd944e2373300dbb4e5735591a60cd872ba (patch) | |
| tree | 81d4f8abaa238908801e3f62246f4b10e9702e7b | |
| parent | 3f4aae7adeea6fab6cc8aca2320f760da69521fa (diff) | |
| download | pidgin-fd783dd944e2373300dbb4e5735591a60cd872ba.tar.gz | |
Remove references to FsStream in PurpleMedia.
| -rw-r--r-- | libpurple/media/backend-fs2.c | 9 | ||||
| -rw-r--r-- | libpurple/media/backend-fs2.h | 5 | ||||
| -rw-r--r-- | libpurple/media/media.c | 6 |
3 files changed, 1 insertions, 19 deletions
diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c index 00275c263e..ae983c94b7 100644 --- a/libpurple/media/backend-fs2.c +++ b/libpurple/media/backend-fs2.c @@ -1949,15 +1949,6 @@ purple_media_backend_fs2_set_send_codec(PurpleMediaBackend *self, 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) diff --git a/libpurple/media/backend-fs2.h b/libpurple/media/backend-fs2.h index 9fbe725254..afd859b7e9 100644 --- a/libpurple/media/backend-fs2.h +++ b/libpurple/media/backend-fs2.h @@ -59,10 +59,7 @@ GType purple_media_backend_fs2_get_type(void); * 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); diff --git a/libpurple/media/media.c b/libpurple/media/media.c index 89dff62178..7e16ff747e 100644 --- a/libpurple/media/media.c +++ b/libpurple/media/media.c @@ -837,12 +837,6 @@ purple_media_add_stream(PurpleMedia *media, const gchar *sess_id, } 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], |