# HG changeset patch # User maiku@pidgin.im # Date 1256676450 0 # Node ID 97a29a3116261442ff2ad297c639294aa48c6865 # Parent eadb9e309b8737184955a4ffd94148a00f00b0f4 Remove references to FsSession in PurpleMedia. diff -r eadb9e309b87 -r 97a29a311626 libpurple/media/backend-fs2.c --- 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) diff -r eadb9e309b87 -r 97a29a311626 libpurple/media/backend-fs2.h --- 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 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); diff -r eadb9e309b87 -r 97a29a311626 libpurple/media/media.c --- 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;