Mercurial > pidgin.yaz
changeset 29590:2751016b8084
Remove references to FsStream in PurpleMedia.
| author | maiku@pidgin.im |
|---|---|
| date | Tue, 27 Oct 2009 21:46:44 +0000 |
| parents | 2e450463e30d |
| children | a71400a86933 |
| files | libpurple/media/backend-fs2.c libpurple/media/backend-fs2.h libpurple/media/media.c |
| diffstat | 3 files changed, 1 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/media/backend-fs2.c Tue Oct 27 21:41:29 2009 +0000 +++ b/libpurple/media/backend-fs2.c Tue Oct 27 21:46:44 2009 +0000 @@ -1949,15 +1949,6 @@ 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)
--- a/libpurple/media/backend-fs2.h Tue Oct 27 21:41:29 2009 +0000 +++ b/libpurple/media/backend-fs2.h Tue Oct 27 21:46:44 2009 +0000 @@ -59,10 +59,7 @@ * 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);
--- a/libpurple/media/media.c Tue Oct 27 21:41:29 2009 +0000 +++ b/libpurple/media/media.c Tue Oct 27 21:46:44 2009 +0000 @@ -837,12 +837,6 @@ } 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],