diff options
| author | Ross Burton <ross@linux.intel.com> | 2010-05-26 18:37:18 +0100 |
|---|---|---|
| committer | Ross Burton <ross@linux.intel.com> | 2010-08-13 11:03:14 +0100 |
| commit | 489ad026958a523351be7be29c0173748e896ebb (patch) | |
| tree | 3558171b4424dccd29b9358157d13c77e24c1865 | |
| parent | e143bf2e02e381f0631d7dccbb602a21df8f6bd0 (diff) | |
| download | librest-489ad026958a523351be7be29c0173748e896ebb.tar.gz | |
Rename rest_proxy_call_invoke to rest_proxy_call_invoke_async
| -rw-r--r-- | rest/rest-proxy-call.c | 14 | ||||
| -rw-r--r-- | rest/rest-proxy-call.h | 10 | ||||
| -rw-r--r-- | tests/proxy.c | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/rest/rest-proxy-call.c b/rest/rest-proxy-call.c index f000dc0..22e1319 100644 --- a/rest/rest-proxy-call.c +++ b/rest/rest-proxy-call.c @@ -970,7 +970,7 @@ _invoke_finished_cb (SoupSession *session, res = g_simple_async_result_new (G_OBJECT (data->call), data->callback, data->user_data, - rest_proxy_call_invoke); + rest_proxy_call_invoke_async); g_simple_async_result_set_op_res_gpointer (res, data, NULL); g_simple_async_result_complete (res); g_object_unref (res); @@ -987,11 +987,11 @@ _invoke_finished_cb (SoupSession *session, } void -rest_proxy_call_invoke (RestProxyCall *call, - GCancellable *cancellable, - GObject *weak_object, - GAsyncReadyCallback callback, - gpointer user_data) +rest_proxy_call_invoke_async (RestProxyCall *call, + GCancellable *cancellable, + GObject *weak_object, + GAsyncReadyCallback callback, + gpointer user_data) { RestProxyCallPrivate *priv; RestProxyCallClass *call_class; @@ -1069,7 +1069,7 @@ rest_proxy_call_invoke_finish (RestProxyCall *call, g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), FALSE); simple = G_SIMPLE_ASYNC_RESULT (result); - g_warn_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (call), rest_proxy_call_invoke)); + g_warn_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (call), rest_proxy_call_invoke_async)); data = g_simple_async_result_get_op_res_gpointer (simple); /* TOOD: do this here or in the callback? */ diff --git a/rest/rest-proxy-call.h b/rest/rest-proxy-call.h index b2df9a4..77e8a44 100644 --- a/rest/rest-proxy-call.h +++ b/rest/rest-proxy-call.h @@ -162,11 +162,11 @@ gboolean rest_proxy_call_cancel (RestProxyCall *call); gboolean rest_proxy_call_sync (RestProxyCall *call, GError **error_out); -void rest_proxy_call_invoke (RestProxyCall *call, - GCancellable *cancellable, - GObject *weak_object, - GAsyncReadyCallback callback, - gpointer user_data); +void rest_proxy_call_invoke_async (RestProxyCall *call, + GCancellable *cancellable, + GObject *weak_object, + GAsyncReadyCallback callback, + gpointer user_data); gboolean rest_proxy_call_invoke_finish (RestProxyCall *call, GAsyncResult *result, diff --git a/tests/proxy.c b/tests/proxy.c index 8bcf4be..79a0683 100644 --- a/tests/proxy.c +++ b/tests/proxy.c @@ -311,7 +311,7 @@ status_ok_test_async (RestProxy *proxy, int status) rest_proxy_call_set_function (call, "status"); rest_proxy_call_add_param (call, "status", g_strdup_printf ("%d", status)); - rest_proxy_call_invoke (call, NULL, NULL, status_ok_cb, GINT_TO_POINTER (status)); + rest_proxy_call_invoke_async (call, NULL, NULL, status_ok_cb, GINT_TO_POINTER (status)); } int |