# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1229393467 0
# Node ID ee2a2a9dda014252905426aeab8c547c55d70f8d
# Parent  0829a08038c639048c10858f73d7e1d3f56175c4
Rename "fs-conference" to "conference".

diff -r 0829a08038c6 -r ee2a2a9dda01 libpurple/media.c
--- a/libpurple/media.c	Tue Dec 16 02:06:55 2008 +0000
+++ b/libpurple/media.c	Tue Dec 16 02:11:07 2008 +0000
@@ -123,7 +123,7 @@
 
 enum {
 	PROP_0,
-	PROP_FS_CONFERENCE,
+	PROP_CONFERENCE,
 };
 
 GType
@@ -159,8 +159,8 @@
 	gobject_class->set_property = purple_media_set_property;
 	gobject_class->get_property = purple_media_get_property;
 
-	g_object_class_install_property(gobject_class, PROP_FS_CONFERENCE,
-			g_param_spec_object("farsight-conference",
+	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,
@@ -305,7 +305,7 @@
 	media = PURPLE_MEDIA(object);
 
 	switch (prop_id) {
-		case PROP_FS_CONFERENCE:
+		case PROP_CONFERENCE:
 			if (media->priv->conference)
 				g_object_unref(media->priv->conference);
 			media->priv->conference = g_value_get_object(value);
@@ -326,7 +326,7 @@
 	media = PURPLE_MEDIA(object);
 
 	switch (prop_id) {
-		case PROP_FS_CONFERENCE:
+		case PROP_CONFERENCE:
 			g_value_set_object(value, media->priv->conference);
 			break;
 		default:	
diff -r 0829a08038c6 -r ee2a2a9dda01 libpurple/mediamanager.c
--- a/libpurple/mediamanager.c	Tue Dec 16 02:06:55 2008 +0000
+++ b/libpurple/mediamanager.c	Tue Dec 16 02:11:07 2008 +0000
@@ -156,7 +156,7 @@
 	}
 
 	media = PURPLE_MEDIA(g_object_new(purple_media_get_type(),
-			     "farsight-conference", conference,
+			     "conference", conference,
 			     NULL));
 
 	ret = gst_element_set_state(purple_media_get_pipeline(media), GST_STATE_PLAYING);