cpw.maiku.media_refactor: 2cc368b5: Deprecate the conference property of Pur...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: 2cc368b5cbb31c025b90fcb71a18944d9c01b55e
Ancestor: d78bdaf73cc5e6b807e5b0eb262ea681a07c0bed
Author: maiku at pidgin.im
Date: 2009-10-23T02:20:35
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/2cc368b5cbb31c025b90fcb71a18944d9c01b55e

Modified files:
        libpurple/media/media.c

ChangeLog: 

Deprecate the conference property of PurpleMedia.

-------------- next part --------------
============================================================
--- libpurple/media/media.c	8df8e99c3fbb09314b00448b36690be4f22eab6c
+++ libpurple/media/media.c	0619cc306d3204e691b631ca062faa4c3ade82ca
@@ -167,7 +167,9 @@ enum {
 	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 @@ 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",
@@ -425,12 +429,14 @@ 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);
@@ -469,9 +475,11 @@ 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);