diff options
| author | Ankit Vani <a@nevitus.org> | 2014-02-04 16:31:36 +0530 |
|---|---|---|
| committer | Ankit Vani <a@nevitus.org> | 2014-02-04 16:31:36 +0530 |
| commit | 44a2e27f79d628156d278284dab2176e3c80a6db (patch) | |
| tree | 388c77429640b7498a5ad609529078e97ae6f20f /libpurple/media.c | |
| parent | 60010288f1ebaaf13c9d32b680f94d34cdac89d8 (diff) | |
| parent | 9e1c8e355f891b9745f4204c20de74be7d5772dd (diff) | |
| download | pidgin-44a2e27f79d628156d278284dab2176e3c80a6db.tar.gz | |
Merge gtkdoc-conversion
Diffstat (limited to 'libpurple/media.c')
| -rw-r--r-- | libpurple/media.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libpurple/media.c b/libpurple/media.c index 631dbcb64c..42ac0276cb 100644 --- a/libpurple/media.c +++ b/libpurple/media.c @@ -73,7 +73,7 @@ struct _PurpleMediaPrivate PurpleMediaBackend *backend; gchar *conference_type; gboolean initiator; - gpointer prpl_data; + gpointer protocol_data; GHashTable *sessions; /* PurpleMediaSession table */ GList *participants; @@ -130,7 +130,7 @@ enum { PROP_ACCOUNT, PROP_CONFERENCE_TYPE, PROP_INITIATOR, - PROP_PRPL_DATA, + PROP_PROTOCOL_DATA, }; #endif @@ -216,10 +216,10 @@ purple_media_class_init (PurpleMediaClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property(gobject_class, PROP_PRPL_DATA, - g_param_spec_pointer("prpl-data", + g_object_class_install_property(gobject_class, PROP_PROTOCOL_DATA, + g_param_spec_pointer("protocol-data", "gpointer", - "Data the prpl plugin set on the media session.", + "Data the protocol set on the media session.", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); purple_media_signals[S_ERROR] = g_signal_new("error", G_TYPE_FROM_CLASS(klass), @@ -394,8 +394,8 @@ purple_media_set_property (GObject *object, guint prop_id, const GValue *value, case PROP_INITIATOR: media->priv->initiator = g_value_get_boolean(value); break; - case PROP_PRPL_DATA: - media->priv->prpl_data = g_value_get_pointer(value); + case PROP_PROTOCOL_DATA: + media->priv->protocol_data = g_value_get_pointer(value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -428,8 +428,8 @@ purple_media_get_property (GObject *object, guint prop_id, GValue *value, GParam case PROP_INITIATOR: g_value_set_boolean(value, media->priv->initiator); break; - case PROP_PRPL_DATA: - g_value_set_pointer(value, media->priv->prpl_data); + case PROP_PROTOCOL_DATA: + g_value_set_pointer(value, media->priv->protocol_data); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -588,24 +588,24 @@ purple_media_get_account(PurpleMedia *media) } gpointer -purple_media_get_prpl_data(PurpleMedia *media) +purple_media_get_protocol_data(PurpleMedia *media) { #ifdef USE_VV - gpointer prpl_data; + gpointer protocol_data; g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL); - g_object_get(G_OBJECT(media), "prpl-data", &prpl_data, NULL); - return prpl_data; + g_object_get(G_OBJECT(media), "protocol-data", &protocol_data, NULL); + return protocol_data; #else return NULL; #endif } void -purple_media_set_prpl_data(PurpleMedia *media, gpointer prpl_data) +purple_media_set_protocol_data(PurpleMedia *media, gpointer protocol_data) { #ifdef USE_VV g_return_if_fail(PURPLE_IS_MEDIA(media)); - g_object_set(G_OBJECT(media), "prpl-data", prpl_data, NULL); + g_object_set(G_OBJECT(media), "protocol-data", protocol_data, NULL); #endif } |