diff options
| author | Michael Ruprecht <maiku@pidgin.im> | 2009-10-27 20:47:30 +0000 |
|---|---|---|
| committer | Michael Ruprecht <maiku@pidgin.im> | 2009-10-27 20:47:30 +0000 |
| commit | 759fc18c8b9aab35f0ed1ea6582ea15dc6f3c976 (patch) | |
| tree | 7aabfb044ace9111f41e872b8a769d3d2815c5f7 | |
| parent | 2f55e1e89885605e9a87051be892895d3fa63d19 (diff) | |
| download | pidgin-759fc18c8b9aab35f0ed1ea6582ea15dc6f3c976.tar.gz | |
Remove references to FsSession in PurpleMedia.
| -rw-r--r-- | libpurple/media/backend-fs2.c | 8 | ||||
| -rw-r--r-- | libpurple/media/backend-fs2.h | 3 | ||||
| -rw-r--r-- | libpurple/media/media.c | 5 |
3 files changed, 0 insertions, 16 deletions
diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c index 26b6a0863f..87f0f206a2 100644 --- a/libpurple/media/backend-fs2.c +++ b/libpurple/media/backend-fs2.c @@ -1927,14 +1927,6 @@ purple_media_backend_fs2_get_conference(PurpleMediaBackendFs2 *self) 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 --git a/libpurple/media/backend-fs2.h b/libpurple/media/backend-fs2.h index 110eea3234..670d6f964b 100644 --- a/libpurple/media/backend-fs2.h +++ b/libpurple/media/backend-fs2.h @@ -62,9 +62,6 @@ GType purple_media_backend_fs2_get_type(void); #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); diff --git a/libpurple/media/media.c b/libpurple/media/media.c index 407f526d11..180771a278 100644 --- a/libpurple/media/media.c +++ b/libpurple/media/media.c @@ -73,8 +73,6 @@ struct _PurpleMediaSession { gchar *id; PurpleMedia *media; - FsSession *session; - PurpleMediaSessionType type; gboolean initiator; }; @@ -897,9 +895,6 @@ purple_media_add_stream(PurpleMedia *media, const gchar *sess_id, 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; |