diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-25 12:33:06 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-02 13:47:13 +0100 |
| commit | 25a35a9eb37aa90434befddef89fbe88d90b6bb2 (patch) | |
| tree | 0ca46218914a24affe11d90fdc47551865201f38 | |
| parent | 7da9ddf427c8d0eda006eaf7517b7c308f9dd1f0 (diff) | |
Telepathy test libs: use g_dbus_method_invocation_return_gerror
Automated:
git grep -lz dbus_g_method_return_error |
xargs -0 perl -pi -e 's/\bdbus_g_method_return_error\b/g_dbus_method_invocation_return_gerror/g'
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=28782
| -rw-r--r-- | tests/lib/telepathy/contactlist/contacts-conn.c | 10 | ||||
| -rw-r--r-- | tests/lib/telepathy/contactlist/room-list-chan.c | 4 | ||||
| -rw-r--r-- | tests/lib/telepathy/contactlist/simple-account-manager.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/lib/telepathy/contactlist/contacts-conn.c b/tests/lib/telepathy/contactlist/contacts-conn.c index f8148c92..632ddcc7 100644 --- a/tests/lib/telepathy/contactlist/contacts-conn.c +++ b/tests/lib/telepathy/contactlist/contacts-conn.c @@ -757,7 +757,7 @@ my_request_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing, if (!tp_handles_are_valid (contact_repo, contacts, FALSE, &error)) { - dbus_g_method_return_error (context, error); + g_dbus_method_invocation_return_gerror (context, error); g_error_free (error); return; } @@ -818,7 +818,7 @@ my_set_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing, /* Verify all handles are valid */ if (!tp_handles_are_valid (contact_repo, handles, FALSE, &error)) { - dbus_g_method_return_error (context, error); + g_dbus_method_invocation_return_gerror (context, error); g_clear_error (&error); goto out; } @@ -864,7 +864,7 @@ my_request_avatars (TpSvcConnectionInterfaceAvatars1 *avatars, if (!tp_handles_are_valid (contact_repo, contacts, FALSE, &error)) { - dbus_g_method_return_error (context, error); + g_dbus_method_invocation_return_gerror (context, error); g_error_free (error); return; } @@ -955,7 +955,7 @@ my_refresh_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj, if (!tp_handles_are_valid (contact_repo, contacts, FALSE, &error)) { - dbus_g_method_return_error (context, error); + g_dbus_method_invocation_return_gerror (context, error); g_error_free (error); return; } @@ -990,7 +990,7 @@ my_request_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj, if (!tp_handle_is_valid (contact_repo, handle, &error)) { - dbus_g_method_return_error (context, error); + g_dbus_method_invocation_return_gerror (context, error); g_error_free (error); return; } diff --git a/tests/lib/telepathy/contactlist/room-list-chan.c b/tests/lib/telepathy/contactlist/room-list-chan.c index a71b29cb..f2749a2f 100644 --- a/tests/lib/telepathy/contactlist/room-list-chan.c +++ b/tests/lib/telepathy/contactlist/room-list-chan.c @@ -218,7 +218,7 @@ room_list_list_rooms (TpSvcChannelTypeRoomList1 *chan, GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Already listing" }; - dbus_g_method_return_error (context, &error); + g_dbus_method_invocation_return_gerror (context, &error); return; } @@ -227,7 +227,7 @@ room_list_list_rooms (TpSvcChannelTypeRoomList1 *chan, GError error = { TP_ERROR, TP_ERROR_SERVICE_CONFUSED, "Computer says no" }; - dbus_g_method_return_error (context, &error); + g_dbus_method_invocation_return_gerror (context, &error); return; } diff --git a/tests/lib/telepathy/contactlist/simple-account-manager.c b/tests/lib/telepathy/contactlist/simple-account-manager.c index e5bddbc1..3979d194 100644 --- a/tests/lib/telepathy/contactlist/simple-account-manager.c +++ b/tests/lib/telepathy/contactlist/simple-account-manager.c @@ -61,7 +61,7 @@ tp_tests_simple_account_manager_create_account (TpSvcAccountManager *svc, if (!tp_strdiff (tp_asv_get_string (in_Parameters, "fail"), "yes")) { GError e = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "loldongs" }; - dbus_g_method_return_error (context, &e); + g_dbus_method_invocation_return_gerror (context, &e); return; } |