# HG changeset patch
# User maiku@pidgin.im
# Date 1256264435 0
# Node ID 846a475a1573600660c3939a0e6e42ea53592caa
# Parent  41ae97b7e97e1e25bc18804e327f50273ef2a970
Deprecate the conference property of PurpleMedia.

diff -r 41ae97b7e97e -r 846a475a1573 libpurple/media/media.c
--- a/libpurple/media/media.c	Fri Oct 23 02:11:33 2009 +0000
+++ b/libpurple/media/media.c	Fri Oct 23 02:20:35 2009 +0000
@@ -167,7 +167,9 @@
 	PROP_0,
 	PROP_MANAGER,
 	PROP_ACCOUNT,
+#ifndef PURPLE_DISABLE_DEPRECATED
 	PROP_CONFERENCE,
+#endif
 	PROP_CONFERENCE_TYPE,
 	PROP_INITIATOR,
 	PROP_PRPL_DATA,
@@ -227,12 +229,14 @@
 			"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",
@@ -425,12 +429,14 @@
 		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);
@@ -469,9 +475,11 @@
 		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);