cpw.maiku.media_refactor: 0468b8aa: Remove references to FsConference in Pur...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: 0468b8aa24e89562c3f2d86f86fefa7f1db6b053
Ancestor: 62b6851dd0dd3084d6d23a7688c9033e81005154
Author: maiku at pidgin.im
Date: 2009-10-27T21:41:29
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/0468b8aa24e89562c3f2d86f86fefa7f1db6b053

Modified files:
        libpurple/media/backend-fs2.c libpurple/media/backend-fs2.h
        libpurple/media/media.c

ChangeLog: 

Remove references to FsConference in PurpleMedia.

-------------- next part --------------
============================================================
--- libpurple/media/backend-fs2.c	c3e1a42ab363bcbd0f1df58b5f2a1b498d11fa33
+++ libpurple/media/backend-fs2.c	95a0ee0a2834399f89baffb2c919f030f3162473
@@ -1949,14 +1949,6 @@ purple_media_backend_fs2_set_send_codec(
 	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)
============================================================
--- libpurple/media/backend-fs2.h	8e59f3233787679b1f089524a23b2a791bf91bda
+++ libpurple/media/backend-fs2.h	e5e62bacaa45879b4dc367ee796935a29f93d8d9
@@ -60,8 +60,6 @@ GType purple_media_backend_fs2_get_type(
  * 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);
============================================================
--- libpurple/media/media.c	8d39e22ee6dda477d8330b522ebf28f51d9fc208
+++ libpurple/media/media.c	0cb2693adaed82bf09153d1330df7fac788e4fa8
@@ -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 (PurpleMediaClas
 			"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 *obje
 		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 *obje
 		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 *med
 		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) {