cpw.maiku.media_refactor: ec8991c7: Remove references to FsParticipant from ...
maiku at pidgin.im
maiku at pidgin.im
Tue Oct 27 20:28:16 EDT 2009
-----------------------------------------------------------------
Revision: ec8991c7f8d9868da959373920a2ae32ab8ce586
Ancestor: 538562140ea9117b4215eeae1caf203b467c7b86
Author: maiku at pidgin.im
Date: 2009-10-27T19:10:57
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/ec8991c7f8d9868da959373920a2ae32ab8ce586
Modified files:
libpurple/media/backend-fs2.c libpurple/media/backend-fs2.h
libpurple/media/media.c
ChangeLog:
Remove references to FsParticipant from PurpleMedia.
-------------- next part --------------
============================================================
--- libpurple/media/backend-fs2.c a38256bd4d56e91e286029e8069554d50cc19ec5
+++ libpurple/media/backend-fs2.c 8eac8d69e247315e214de7fb93326a377455349e
@@ -1669,13 +1669,6 @@ purple_media_backend_fs2_get_session(Pur
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)
============================================================
--- libpurple/media/backend-fs2.h 62ac6290b278b3decde69c042e226f93717cdb85
+++ libpurple/media/backend-fs2.h 6407645ec4e377e2af30a6663ad17537e1ebaef1
@@ -65,9 +65,6 @@ FsSession *purple_media_backend_fs2_get_
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);
============================================================
--- libpurple/media/media.c 61c91af6e8b7e5f8e66fa44d969b017d3205764d
+++ libpurple/media/media.c c01b9220cea60c803594482d938bd6e3b5a14288
@@ -1149,7 +1149,6 @@ purple_media_add_stream(PurpleMedia *med
{
#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 *med
}
}
- 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;
More information about the Commits
mailing list