diff options
Diffstat (limited to 'libs/net/grl-net-mock.c')
| -rw-r--r-- | libs/net/grl-net-mock.c | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/libs/net/grl-net-mock.c b/libs/net/grl-net-mock.c index 52a5ca2..87ad503 100644 --- a/libs/net/grl-net-mock.c +++ b/libs/net/grl-net-mock.c @@ -58,6 +58,7 @@ get_url_mocked (GrlNetWc *self, GError *error = NULL; GStatBuf stat_buf; char *new_url; + GTask *task = G_TASK (result); if (ignored_parameters) { g_autoptr(GUri) uri = g_uri_parse (url, G_URI_FLAGS_PARSE_RELAXED, NULL); @@ -85,28 +86,26 @@ get_url_mocked (GrlNetWc *self, } if (!config) { - g_simple_async_result_set_error (G_SIMPLE_ASYNC_RESULT (result), - GRL_NET_WC_ERROR, - GRL_NET_WC_ERROR_NETWORK_ERROR, - "%s", - _("No mock definition found")); + g_task_return_new_error (task, + GRL_NET_WC_ERROR, + GRL_NET_WC_ERROR_NETWORK_ERROR, + "%s", + _("No mock definition found")); g_free (new_url); - g_simple_async_result_complete_in_idle (G_SIMPLE_ASYNC_RESULT (result)); - g_object_unref (result); + g_object_unref (task); return; } data_file = g_key_file_get_value (config, new_url, "data", &error); if (error) { - g_simple_async_result_set_error (G_SIMPLE_ASYNC_RESULT (result), - GRL_NET_WC_ERROR, - GRL_NET_WC_ERROR_NOT_FOUND, - _("Could not find mock content %s"), - error->message); + g_task_return_new_error (task, + GRL_NET_WC_ERROR, + GRL_NET_WC_ERROR_NOT_FOUND, + _("Could not find mock content %s"), + error->message); g_error_free (error); g_free (new_url); - g_simple_async_result_complete_in_idle (G_SIMPLE_ASYNC_RESULT (result)); - g_object_unref (result); + g_object_unref (task); return; } if (data_file[0] != '/') { @@ -116,13 +115,12 @@ get_url_mocked (GrlNetWc *self, } if (g_stat (full_path, &stat_buf) < 0) { - g_simple_async_result_set_error (G_SIMPLE_ASYNC_RESULT (result), - GRL_NET_WC_ERROR, - GRL_NET_WC_ERROR_NOT_FOUND, - _("Could not access mock content: %s"), - data_file); - g_simple_async_result_complete_in_idle (G_SIMPLE_ASYNC_RESULT (result)); - g_object_unref (result); + g_task_return_new_error (task, + GRL_NET_WC_ERROR, + GRL_NET_WC_ERROR_NOT_FOUND, + _("Could not access mock content: %s"), + data_file); + g_object_unref (task); g_free (new_url); g_clear_pointer (&data_file, g_free); g_clear_pointer (&full_path, g_free); @@ -132,11 +130,8 @@ get_url_mocked (GrlNetWc *self, g_clear_pointer (&data_file, g_free); g_clear_pointer (&full_path, g_free); - g_simple_async_result_set_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result), - new_url, - NULL); - g_simple_async_result_complete_in_idle (G_SIMPLE_ASYNC_RESULT (result)); - g_object_unref (result); + g_task_return_pointer (task, new_url, NULL); + g_object_unref (task); } void |