Mercurial > pidgin

comparison libpurple/media/media.c @ 29156:846a475a1573

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecate the conference property of PurpleMedia.
author maiku@pidgin.im
date Fri, 23 Oct 2009 02:20:35 +0000
parents 41ae97b7e97e
children e85df0170905
comparison
equal deleted inserted replaced
29155:41ae97b7e97e 29156:846a475a1573
165 165
166 enum { 166 enum {
167 PROP_0, 167 PROP_0,
168 PROP_MANAGER, 168 PROP_MANAGER,
169 PROP_ACCOUNT, 169 PROP_ACCOUNT,
170 #ifndef PURPLE_DISABLE_DEPRECATED
170 PROP_CONFERENCE, 171 PROP_CONFERENCE,
172 #endif
171 PROP_CONFERENCE_TYPE, 173 PROP_CONFERENCE_TYPE,
172 PROP_INITIATOR, 174 PROP_INITIATOR,
173 PROP_PRPL_DATA, 175 PROP_PRPL_DATA,
174 }; 176 };
175 #endif 177 #endif
225 g_param_spec_pointer("account", 227 g_param_spec_pointer("account",
226 "PurpleAccount", 228 "PurpleAccount",
227 "The account this media session is on.", 229 "The account this media session is on.",
228 G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE)); 230 G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
229 231
232 #ifndef PURPLE_DISABLE_DEPRECATED
230 g_object_class_install_property(gobject_class, PROP_CONFERENCE, 233 g_object_class_install_property(gobject_class, PROP_CONFERENCE,
231 g_param_spec_object("conference", 234 g_param_spec_object("conference",
232 "Farsight conference", 235 "Farsight conference",
233 "The FsConference associated with this media.", 236 "The FsConference associated with this media.",
234 FS_TYPE_CONFERENCE, 237 FS_TYPE_CONFERENCE,
235 G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE)); 238 G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
239 #endif
236 240
237 g_object_class_install_property(gobject_class, PROP_CONFERENCE_TYPE, 241 g_object_class_install_property(gobject_class, PROP_CONFERENCE_TYPE,
238 g_param_spec_string("conference-type", 242 g_param_spec_string("conference-type",
239 "Conference Type", 243 "Conference Type",
240 "The type of conference that this media object " 244 "The type of conference that this media object "
423 media->priv->manager = g_value_dup_object(value); 427 media->priv->manager = g_value_dup_object(value);
424 break; 428 break;
425 case PROP_ACCOUNT: 429 case PROP_ACCOUNT:
426 media->priv->account = g_value_get_pointer(value); 430 media->priv->account = g_value_get_pointer(value);
427 break; 431 break;
432 #ifndef PURPLE_DISABLE_DEPRECATED
428 case PROP_CONFERENCE: { 433 case PROP_CONFERENCE: {
429 if (media->priv->conference) 434 if (media->priv->conference)
430 gst_object_unref(media->priv->conference); 435 gst_object_unref(media->priv->conference);
431 media->priv->conference = g_value_dup_object(value); 436 media->priv->conference = g_value_dup_object(value);
432 break; 437 break;
433 } 438 }
439 #endif
434 case PROP_CONFERENCE_TYPE: 440 case PROP_CONFERENCE_TYPE:
435 media->priv->conference_type = 441 media->priv->conference_type =
436 g_value_dup_string(value); 442 g_value_dup_string(value);
437 /* Will eventually get this type from the media manager */ 443 /* Will eventually get this type from the media manager */
438 media->priv->backend = g_object_new( 444 media->priv->backend = g_object_new(
467 g_value_set_object(value, media->priv->manager); 473 g_value_set_object(value, media->priv->manager);
468 break; 474 break;
469 case PROP_ACCOUNT: 475 case PROP_ACCOUNT:
470 g_value_set_pointer(value, media->priv->account); 476 g_value_set_pointer(value, media->priv->account);
471 break; 477 break;
478 #ifndef PURPLE_DISABLE_DEPRECATED
472 case PROP_CONFERENCE: 479 case PROP_CONFERENCE:
473 g_value_set_object(value, media->priv->conference); 480 g_value_set_object(value, media->priv->conference);
474 break; 481 break;
482 #endif
475 case PROP_CONFERENCE_TYPE: 483 case PROP_CONFERENCE_TYPE:
476 g_value_set_string(value, 484 g_value_set_string(value,
477 media->priv->conference_type); 485 media->priv->conference_type);
478 break; 486 break;
479 case PROP_INITIATOR: 487 case PROP_INITIATOR: