cpw.maiku.media_refactor: 77061d41: Add a conference-type parameter to Purpl...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: 77061d4133a39bb56058ac7a25255761c2a0fdd3
Ancestor: d2a1ded525b0ffd2f388583c02ecd72169fc28de
Author: maiku at pidgin.im
Date: 2009-10-23T00:01:54
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/77061d4133a39bb56058ac7a25255761c2a0fdd3

Modified files:
        libpurple/media/media.c

ChangeLog: 

Add a conference-type parameter to PurpleMedia.

-------------- next part --------------
============================================================
--- libpurple/media/media.c	80bab8dfc586c460a5b70794fb4f50e8a1b4a236
+++ libpurple/media/media.c	7db828aa88c86bd785659c29f1f8b84ae6dc8c89
@@ -109,6 +109,7 @@ struct _PurpleMediaPrivate
 	PurpleMediaManager *manager;
 	PurpleAccount *account;
 	FsConference *conference;
+	gchar *conference_type;
 	gboolean initiator;
 	gpointer prpl_data;
 
@@ -164,6 +165,7 @@ enum {
 	PROP_MANAGER,
 	PROP_ACCOUNT,
 	PROP_CONFERENCE,
+	PROP_CONFERENCE_TYPE,
 	PROP_INITIATOR,
 	PROP_PRPL_DATA,
 };
@@ -229,6 +231,14 @@ purple_media_class_init (PurpleMediaClas
 			FS_TYPE_CONFERENCE,
 			G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
 
+	g_object_class_install_property(gobject_class, PROP_CONFERENCE_TYPE,
+			g_param_spec_string("conference-type",
+			"Conference Type",
+			"The type of conference that this media object "
+			"has been created to provide.",
+			NULL,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
 	g_object_class_install_property(gobject_class, PROP_INITIATOR,
 			g_param_spec_boolean("initiator",
 			"initiator",
@@ -459,6 +469,10 @@ purple_media_set_property (GObject *obje
 			purple_media_setup_pipeline(media);
 			break;
 		}
+		case PROP_CONFERENCE_TYPE:
+			media->priv->conference_type =
+					g_value_dup_string(value);
+			break;
 		case PROP_INITIATOR:
 			media->priv->initiator = g_value_get_boolean(value);
 			break;
@@ -489,6 +503,10 @@ purple_media_get_property (GObject *obje
 		case PROP_CONFERENCE:
 			g_value_set_object(value, media->priv->conference);
 			break;
+		case PROP_CONFERENCE_TYPE:
+			g_value_set_string(value,
+					media->priv->conference_type);
+			break;
 		case PROP_INITIATOR:
 			g_value_set_boolean(value, media->priv->initiator);
 			break;