pidgin.vv: 6ace5b35: Rename "fs-conference" to "conference".

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 6ace5b357bd34d1a93fad3fcf59b31f846c64e0b
Ancestor: 0d1fd3b70254200426c628d04e9eaebbb230254f
Author: maiku at soc.pidgin.im
Date: 2008-12-16T02:11:07
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/6ace5b357bd34d1a93fad3fcf59b31f846c64e0b

Modified files:
        libpurple/media.c libpurple/mediamanager.c

ChangeLog: 

Rename "fs-conference" to "conference".

-------------- next part --------------
============================================================
--- libpurple/media.c	352193d70fd61649fefed086020fb57ff23c478e
+++ libpurple/media.c	2595ced65e4af270169ccaae4654893660706535
@@ -123,7 +123,7 @@ enum {
 
 enum {
 	PROP_0,
-	PROP_FS_CONFERENCE,
+	PROP_CONFERENCE,
 };
 
 GType
@@ -159,8 +159,8 @@ purple_media_class_init (PurpleMediaClas
 	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 @@ purple_media_set_property (GObject *obje
 	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 @@ purple_media_get_property (GObject *obje
 	media = PURPLE_MEDIA(object);
 
 	switch (prop_id) {
-		case PROP_FS_CONFERENCE:
+		case PROP_CONFERENCE:
 			g_value_set_object(value, media->priv->conference);
 			break;
 		default:	
============================================================
--- libpurple/mediamanager.c	6a2f4353b7992e17a93b0257a6b8b38fb2e45bd5
+++ libpurple/mediamanager.c	152adc89af79a4b21ef1ebbb41e0337f23e6ec65
@@ -156,7 +156,7 @@ purple_media_manager_create_media(Purple
 	}
 
 	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);