Mercurial > pidgin.yaz
diff libpurple/media/media.c @ 29589:2e450463e30d
Remove references to FsConference in PurpleMedia.
author | maiku@pidgin.im |
---|---|
date | Tue, 27 Oct 2009 21:41:29 +0000 |
parents | c08c36bd009d |
children | 2751016b8084 |
line wrap: on
line diff
--- a/libpurple/media/media.c Tue Oct 27 21:39:00 2009 +0000 +++ b/libpurple/media/media.c Tue Oct 27 21:41:29 2009 +0000 @@ -102,7 +102,6 @@ PurpleMediaManager *manager; PurpleAccount *account; PurpleMediaBackend *backend; - FsConference *conference; gchar *conference_type; gulong gst_bus_handler_id; gboolean initiator; @@ -160,9 +159,6 @@ 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 @@ "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 @@ 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 @@ 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 @@ 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) {