diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-26 14:37:41 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-26 16:30:50 +0100 |
| commit | b29452b531d9edadeb5558697c58c35ecf2f44c2 (patch) | |
| tree | c48191112ae06a300dbcce0d2b23665f0e3cce19 /telepathy-glib/presence-mixin.c | |
| parent | b8b0af6611ffabc84ad992697e2ae6c87e3483d8 (diff) | |
| download | telepathy-glib-b29452b531d9edadeb5558697c58c35ecf2f44c2.tar.gz | |
Use tp_value_array_free instead of g_value_array_free
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69849
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
Diffstat (limited to 'telepathy-glib/presence-mixin.c')
| -rw-r--r-- | telepathy-glib/presence-mixin.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/telepathy-glib/presence-mixin.c b/telepathy-glib/presence-mixin.c index 8bb5ac4e9..e954b47ff 100644 --- a/telepathy-glib/presence-mixin.c +++ b/telepathy-glib/presence-mixin.c @@ -556,7 +556,7 @@ construct_presence_hash (const TpPresenceStatusSpec *supported_statuses, GHashTable *contact_statuses) { GHashTable *presence_hash = g_hash_table_new_full (NULL, NULL, NULL, - (GDestroyNotify) g_value_array_free); + (GDestroyNotify) tp_value_array_free); GHashTableIter iter; gpointer key, value; @@ -840,7 +840,7 @@ tp_presence_mixin_get_statuses (TpSvcConnectionInterfacePresence *iface, TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (conn, context); ret = g_hash_table_new_full (g_str_hash, g_str_equal, - NULL, (GDestroyNotify) g_value_array_free); + NULL, (GDestroyNotify) tp_value_array_free); for (i=0; mixin_cls->statuses[i].name != NULL; i++) { @@ -1241,7 +1241,7 @@ tp_presence_mixin_get_simple_presence_dbus_property (GObject *object, g_return_if_fail (G_VALUE_HOLDS_BOXED (value)); ret = g_hash_table_new_full (g_str_hash, g_str_equal, - NULL, (GDestroyNotify) g_value_array_free); + NULL, (GDestroyNotify) tp_value_array_free); for (i=0; mixin_cls->statuses[i].name != NULL; i++) { @@ -1423,7 +1423,7 @@ construct_simple_presence_hash (const TpPresenceStatusSpec *supported_statuses, GHashTable *contact_statuses) { GHashTable *presence_hash = g_hash_table_new_full (NULL, NULL, NULL, - (GDestroyNotify) g_value_array_free); + (GDestroyNotify) tp_value_array_free); GHashTableIter iter; gpointer key, value; @@ -1541,6 +1541,9 @@ tp_presence_mixin_simple_presence_fill_contact_attributes (GObject *obj, { GHashTableIter iter; gpointer key, value; + G_GNUC_BEGIN_IGNORE_DEPRECATIONS + GType type = G_TYPE_VALUE_ARRAY; + G_GNUC_END_IGNORE_DEPRECATIONS g_hash_table_iter_init (&iter, contact_statuses); while (g_hash_table_iter_next (&iter, &key, &value)) @@ -1552,7 +1555,7 @@ tp_presence_mixin_simple_presence_fill_contact_attributes (GObject *obj, tp_contacts_mixin_set_contact_attribute (attributes_hash, handle, TP_TOKEN_CONNECTION_INTERFACE_SIMPLE_PRESENCE_PRESENCE, - tp_g_value_slice_new_take_boxed (G_TYPE_VALUE_ARRAY, presence)); + tp_g_value_slice_new_take_boxed (type, presence)); } g_hash_table_unref (contact_statuses); |