summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Ruprecht <maiku@pidgin.im>2009-10-27 19:10:57 +0000
committerMichael Ruprecht <maiku@pidgin.im>2009-10-27 19:10:57 +0000
commit21e4560c1ba57a27005d9aef7a02b95e502ec673 (patch)
treedb7dbd1d4bddb8f2a1549dd1ec5a71572dac9532
parent87c844f54b9954b25b682c027781e9957943f644 (diff)
downloadpidgin-21e4560c1ba57a27005d9aef7a02b95e502ec673.tar.gz
Remove references to FsParticipant from PurpleMedia.
-rw-r--r--libpurple/media/backend-fs2.c7
-rw-r--r--libpurple/media/backend-fs2.h3
-rw-r--r--libpurple/media/media.c4
3 files changed, 0 insertions, 14 deletions
diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
index b92a1ca5c3..72777d4869 100644
--- a/libpurple/media/backend-fs2.c
+++ b/libpurple/media/backend-fs2.c
@@ -1669,13 +1669,6 @@ purple_media_backend_fs2_get_session(PurpleMediaBackendFs2 *self,
return session != NULL? session->session : NULL;
}
-FsParticipant *
-purple_media_backend_fs2_get_participant(PurpleMediaBackendFs2 *self,
- const gchar *name)
-{
- return _get_participant(self, name);
-}
-
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 7044da6efe..6a2a735d18 100644
--- a/libpurple/media/backend-fs2.h
+++ b/libpurple/media/backend-fs2.h
@@ -65,9 +65,6 @@ FsConference *purple_media_backend_fs2_get_conference(
FsSession *purple_media_backend_fs2_get_session(
PurpleMediaBackendFs2 *self,
const gchar *sess_id);
-FsParticipant *purple_media_backend_fs2_get_participant(
- PurpleMediaBackendFs2 *self,
- const gchar *name);
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 aa5b853335..94b2da3a45 100644
--- a/libpurple/media/media.c
+++ b/libpurple/media/media.c
@@ -1149,7 +1149,6 @@ purple_media_add_stream(PurpleMedia *media, const gchar *sess_id,
{
#ifdef USE_VV
PurpleMediaSession *session;
- FsParticipant *participant = NULL;
PurpleMediaStream *stream = NULL;
FsMediaType media_type = purple_media_to_fs_media_type(type);
FsStreamDirection type_direction =
@@ -1227,9 +1226,6 @@ purple_media_add_stream(PurpleMedia *media, const gchar *sess_id,
}
}
- participant = purple_media_backend_fs2_get_participant(
- PURPLE_MEDIA_BACKEND_FS2(media->priv->backend), who);
-
if (purple_media_get_stream(media, sess_id, who) == NULL) {
FsStream *fsstream = NULL;