diff options
author | Michael Ruprecht <maiku@pidgin.im> | 2009-10-27 21:41:29 +0000 |
---|---|---|
committer | Michael Ruprecht <maiku@pidgin.im> | 2009-10-27 21:41:29 +0000 |
commit | 3f4aae7adeea6fab6cc8aca2320f760da69521fa (patch) | |
tree | f1363975c8f2ed2057699448821d6c198bfed11f | |
parent | ccf180fe497fefd70da0614df59c4334b79de0d3 (diff) | |
download | pidgin-3f4aae7adeea6fab6cc8aca2320f760da69521fa.tar.gz |
Remove references to FsConference in PurpleMedia.
-rw-r--r-- | libpurple/media/backend-fs2.c | 8 | ||||
-rw-r--r-- | libpurple/media/backend-fs2.h | 2 | ||||
-rw-r--r-- | libpurple/media/media.c | 34 |
3 files changed, 0 insertions, 44 deletions
diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c index 79bbe6cadd..00275c263e 100644 --- a/libpurple/media/backend-fs2.c +++ b/libpurple/media/backend-fs2.c @@ -1949,14 +1949,6 @@ purple_media_backend_fs2_set_send_codec(PurpleMediaBackend *self, return TRUE; } -FsConference * -purple_media_backend_fs2_get_conference(PurpleMediaBackendFs2 *self) -{ - PurpleMediaBackendFs2Private *priv = - PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); - return priv->conference; -} - 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 711b9ce409..9fbe725254 100644 --- a/libpurple/media/backend-fs2.h +++ b/libpurple/media/backend-fs2.h @@ -60,8 +60,6 @@ GType purple_media_backend_fs2_get_type(void); * integrating with PurpleMedia */ #include <gst/farsight/fs-conference-iface.h> -FsConference *purple_media_backend_fs2_get_conference( - PurpleMediaBackendFs2 *self); 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 51a605f5a3..89dff62178 100644 --- a/libpurple/media/media.c +++ b/libpurple/media/media.c @@ -102,7 +102,6 @@ struct _PurpleMediaPrivate PurpleMediaManager *manager; PurpleAccount *account; PurpleMediaBackend *backend; - FsConference *conference; gchar *conference_type; gulong gst_bus_handler_id; gboolean initiator; @@ -160,9 +159,6 @@ enum { PROP_0, PROP_MANAGER, PROP_ACCOUNT, -#ifndef PURPLE_DISABLE_DEPRECATED - PROP_CONFERENCE, -#endif PROP_CONFERENCE_TYPE, PROP_INITIATOR, PROP_PRPL_DATA, @@ -222,15 +218,6 @@ purple_media_class_init (PurpleMediaClass *klass) "The account this media session is on.", G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE)); -#ifndef PURPLE_DISABLE_DEPRECATED - g_object_class_install_property(gobject_class, PROP_CONFERENCE, - g_param_spec_object("conference", - "Farsight conference", - "The FsConference associated with this media.", - FS_TYPE_CONFERENCE, - G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE)); -#endif - g_object_class_install_property(gobject_class, PROP_CONFERENCE_TYPE, g_param_spec_string("conference-type", "Conference Type", @@ -399,14 +386,6 @@ purple_media_set_property (GObject *object, guint prop_id, const GValue *value, case PROP_ACCOUNT: media->priv->account = g_value_get_pointer(value); break; -#ifndef PURPLE_DISABLE_DEPRECATED - case PROP_CONFERENCE: { - if (media->priv->conference) - gst_object_unref(media->priv->conference); - media->priv->conference = g_value_dup_object(value); - break; - } -#endif case PROP_CONFERENCE_TYPE: media->priv->conference_type = g_value_dup_string(value); @@ -465,11 +444,6 @@ purple_media_get_property (GObject *object, guint prop_id, GValue *value, GParam case PROP_ACCOUNT: g_value_set_pointer(value, media->priv->account); break; -#ifndef PURPLE_DISABLE_DEPRECATED - case PROP_CONFERENCE: - g_value_set_object(value, media->priv->conference); - break; -#endif case PROP_CONFERENCE_TYPE: g_value_set_string(value, media->priv->conference_type); @@ -847,14 +821,6 @@ purple_media_add_stream(PurpleMedia *media, const gchar *sess_id, return FALSE; } - /* XXX: Temporary call while integrating with backend */ - if (media->priv->conference == NULL) { - media->priv->conference = - purple_media_backend_fs2_get_conference( - PURPLE_MEDIA_BACKEND_FS2( - media->priv->backend)); - } - session = purple_media_get_session(media, sess_id); if (!session) { |