Mercurial > pidgin

comparison libpurple/media.c @ 24985:ee2a2a9dda01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename "fs-conference" to "conference".
author Mike Ruprecht <maiku@soc.pidgin.im>
date Tue, 16 Dec 2008 02:11:07 +0000
parents 0829a08038c6
children c7d4b67b3332
comparison
equal deleted inserted replaced
24984:0829a08038c6 24985:ee2a2a9dda01
121 }; 121 };
122 static guint purple_media_signals[LAST_SIGNAL] = {0}; 122 static guint purple_media_signals[LAST_SIGNAL] = {0};
123 123
124 enum { 124 enum {
125 PROP_0, 125 PROP_0,
126 PROP_FS_CONFERENCE, 126 PROP_CONFERENCE,
127 }; 127 };
128 128
129 GType 129 GType
130 purple_media_get_type() 130 purple_media_get_type()
131 { 131 {
157 157
158 gobject_class->finalize = purple_media_finalize; 158 gobject_class->finalize = purple_media_finalize;
159 gobject_class->set_property = purple_media_set_property; 159 gobject_class->set_property = purple_media_set_property;
160 gobject_class->get_property = purple_media_get_property; 160 gobject_class->get_property = purple_media_get_property;
161 161
162 g_object_class_install_property(gobject_class, PROP_FS_CONFERENCE, 162 g_object_class_install_property(gobject_class, PROP_CONFERENCE,
163 g_param_spec_object("farsight-conference", 163 g_param_spec_object("conference",
164 "Farsight conference", 164 "Farsight conference",
165 "The FsConference associated with this media.", 165 "The FsConference associated with this media.",
166 FS_TYPE_CONFERENCE, 166 FS_TYPE_CONFERENCE,
167 G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE)); 167 G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
168 168
303 g_return_if_fail(PURPLE_IS_MEDIA(object)); 303 g_return_if_fail(PURPLE_IS_MEDIA(object));
304 304
305 media = PURPLE_MEDIA(object); 305 media = PURPLE_MEDIA(object);
306 306
307 switch (prop_id) { 307 switch (prop_id) {
308 case PROP_FS_CONFERENCE: 308 case PROP_CONFERENCE:
309 if (media->priv->conference) 309 if (media->priv->conference)
310 g_object_unref(media->priv->conference); 310 g_object_unref(media->priv->conference);
311 media->priv->conference = g_value_get_object(value); 311 media->priv->conference = g_value_get_object(value);
312 g_object_ref(media->priv->conference); 312 g_object_ref(media->priv->conference);
313 break; 313 break;
324 g_return_if_fail(PURPLE_IS_MEDIA(object)); 324 g_return_if_fail(PURPLE_IS_MEDIA(object));
325 325
326 media = PURPLE_MEDIA(object); 326 media = PURPLE_MEDIA(object);
327 327
328 switch (prop_id) { 328 switch (prop_id) {
329 case PROP_FS_CONFERENCE: 329 case PROP_CONFERENCE:
330 g_value_set_object(value, media->priv->conference); 330 g_value_set_object(value, media->priv->conference);
331 break; 331 break;
332 default: 332 default:
333 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); 333 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
334 break; 334 break;