changeset 29584:97a29a311626

Remove references to FsSession in PurpleMedia.
author maiku@pidgin.im
date Tue, 27 Oct 2009 20:47:30 +0000
parents eadb9e309b87
children 95f918df7f09
files libpurple/media/backend-fs2.c libpurple/media/backend-fs2.h libpurple/media/media.c
diffstat 3 files changed, 0 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/media/backend-fs2.c	Tue Oct 27 20:43:30 2009 +0000
+++ b/libpurple/media/backend-fs2.c	Tue Oct 27 20:47:30 2009 +0000
@@ -1927,14 +1927,6 @@
 	return priv->conference;
 }
 
-FsSession *
-purple_media_backend_fs2_get_session(PurpleMediaBackendFs2 *self,
-		const gchar *sess_id)
-{
-	PurpleMediaBackendFs2Session *session = _get_session(self, sess_id);
-	return session != NULL? session->session : NULL;
-}
-
 FsStream *
 purple_media_backend_fs2_get_stream(PurpleMediaBackendFs2 *self,
 		const gchar *sess_id, const gchar *who)
--- a/libpurple/media/backend-fs2.h	Tue Oct 27 20:43:30 2009 +0000
+++ b/libpurple/media/backend-fs2.h	Tue Oct 27 20:47:30 2009 +0000
@@ -62,9 +62,6 @@
 #include <gst/farsight/fs-conference-iface.h>
 FsConference *purple_media_backend_fs2_get_conference(
 		PurpleMediaBackendFs2 *self);
-FsSession *purple_media_backend_fs2_get_session(
-		PurpleMediaBackendFs2 *self,
-		const gchar *sess_id);
 FsStream *purple_media_backend_fs2_get_stream(
 		PurpleMediaBackendFs2 *self,
 		const gchar *sess_id, const gchar *who);
--- a/libpurple/media/media.c	Tue Oct 27 20:43:30 2009 +0000
+++ b/libpurple/media/media.c	Tue Oct 27 20:47:30 2009 +0000
@@ -73,8 +73,6 @@
 {
 	gchar *id;
 	PurpleMedia *media;
-	FsSession *session;
-
 	PurpleMediaSessionType type;
 	gboolean initiator;
 };
@@ -897,9 +895,6 @@
 
 	if (!session) {
 		session = g_new0(PurpleMediaSession, 1);
-		session->session = purple_media_backend_fs2_get_session(
-				PURPLE_MEDIA_BACKEND_FS2(media->priv->backend),
-				sess_id);
 		session->id = g_strdup(sess_id);
 		session->media = media;
 		session->type = type;