diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-28 15:03:50 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-02-05 18:44:41 +0000 |
commit | e2c5a9febbe2c1d198a687b20f5f301dd87fc950 (patch) | |
tree | 929091ac67238c357464d16f730be0766c0ee429 | |
parent | 6e11690ea0f35530d1e01a4df779cab6ab3cba6c (diff) |
Ignore GTask being GLib 2.36 API so this can compile in Empathy 3.838-goa-mc-517
-rw-r--r-- | goa-mc-plugin/mcp-account-manager-goa.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c index 870f525d..8920ec65 100644 --- a/goa-mc-plugin/mcp-account-manager-goa.c +++ b/goa-mc-plugin/mcp-account-manager-goa.c @@ -802,16 +802,22 @@ mcp_account_manager_goa_delete_async (McpAccountStorage *self, GAsyncReadyCallback callback, gpointer user_data) { + G_GNUC_BEGIN_IGNORE_DEPRECATIONS GTask *task = g_task_new (self, cancellable, callback, user_data); + G_GNUC_END_IGNORE_DEPRECATIONS if (mcp_account_manager_goa_delete (self, am, account_name, NULL)) { + G_GNUC_BEGIN_IGNORE_DEPRECATIONS g_task_return_boolean (task, TRUE); + G_GNUC_END_IGNORE_DEPRECATIONS } else { + G_GNUC_BEGIN_IGNORE_DEPRECATIONS g_task_return_new_error (task, TP_ERROR, TP_ERROR_DOES_NOT_EXIST, "Account does not exist in GOA"); + G_GNUC_END_IGNORE_DEPRECATIONS } g_object_unref (task); @@ -822,7 +828,9 @@ mcp_account_manager_goa_delete_finish (McpAccountStorage *self, GAsyncResult *res, GError **error) { + G_GNUC_BEGIN_IGNORE_DEPRECATIONS return g_task_propagate_boolean (G_TASK (res), error); + G_GNUC_END_IGNORE_DEPRECATIONS } #endif /* MC >= 5.18 API */ |