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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/dbus/contacts.c | 2 | ||||
| -rw-r--r-- | tests/lib/broken-client-types-conn.c | 5 | ||||
| -rw-r--r-- | tests/lib/contacts-conn.c | 2 | ||||
| -rw-r--r-- | tests/lib/room-list-chan.c | 2 | ||||
| -rw-r--r-- | tests/util.c | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/tests/dbus/contacts.c b/tests/dbus/contacts.c index 9a4e9cc1e..0155cd221 100644 --- a/tests/dbus/contacts.c +++ b/tests/dbus/contacts.c @@ -326,7 +326,7 @@ test_contact_info (Fixture *f, GCancellable *cancellable; /* Create fake info fields */ - info = g_ptr_array_new_with_free_func ((GDestroyNotify) g_value_array_free); + info = g_ptr_array_new_with_free_func ((GDestroyNotify) tp_value_array_free); g_ptr_array_add (info, tp_value_array_build (3, G_TYPE_STRING, "n", G_TYPE_STRV, NULL, diff --git a/tests/lib/broken-client-types-conn.c b/tests/lib/broken-client-types-conn.c index cdc273a3d..1c6f3aff1 100644 --- a/tests/lib/broken-client-types-conn.c +++ b/tests/lib/broken-client-types-conn.c @@ -36,6 +36,9 @@ broken_fill_client_types ( GHashTable *attributes) { guint i; + G_GNUC_BEGIN_IGNORE_DEPRECATIONS + GType type = G_TYPE_VALUE_ARRAY; + G_GNUC_END_IGNORE_DEPRECATIONS for (i = 0; i < contacts->len; i++) { @@ -50,7 +53,7 @@ broken_fill_client_types ( tp_contacts_mixin_set_contact_attribute (attributes, 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)); } } diff --git a/tests/lib/contacts-conn.c b/tests/lib/contacts-conn.c index 9d4387bfb..e90612e40 100644 --- a/tests/lib/contacts-conn.c +++ b/tests/lib/contacts-conn.c @@ -653,7 +653,7 @@ tp_tests_contacts_connection_change_aliases (TpTestsContactsConnection *self, tp_svc_connection_interface_aliasing_emit_aliases_changed (self, structs); - g_ptr_array_foreach (structs, (GFunc) g_value_array_free, NULL); + g_ptr_array_foreach (structs, (GFunc) tp_value_array_free, NULL); g_ptr_array_unref (structs); } diff --git a/tests/lib/room-list-chan.c b/tests/lib/room-list-chan.c index e6134a3db..cc5f15ff0 100644 --- a/tests/lib/room-list-chan.c +++ b/tests/lib/room-list-chan.c @@ -190,7 +190,7 @@ find_rooms (gpointer data) TpTestsRoomListChan *self = TP_TESTS_ROOM_LIST_CHAN (data); GPtrArray *rooms; - rooms = g_ptr_array_new_with_free_func ((GDestroyNotify) g_value_array_free); + rooms = g_ptr_array_new_with_free_func ((GDestroyNotify) tp_value_array_free); /* Find 2 rooms */ add_room (rooms); diff --git a/tests/util.c b/tests/util.c index dad995ca6..44fee02ce 100644 --- a/tests/util.c +++ b/tests/util.c @@ -49,7 +49,7 @@ test_value_array_build (void) g_assert_cmpstr (host_out, ==, host); g_assert_cmpuint (port_out, ==, port); - g_value_array_free (arr); + tp_value_array_free (arr); } static void |