summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross@linux.intel.com>2009-05-15 16:47:03 +0100
committerRoss Burton <ross@linux.intel.com>2009-08-11 11:20:54 +0100
commite16a6f83bcd0bfe4e25f889c853c63698e82c3a7 (patch)
tree51030b0a567cd894c5f740255d18648383be03cc
parent8f6fdab38e2b612f86afd566880a8ca15f7a6124 (diff)
downloadlibrest-e16a6f83bcd0bfe4e25f889c853c63698e82c3a7.tar.gz
Remove the useless error argument from rest_proxy_call_cancellibrest-0.6
-rw-r--r--rest/rest-proxy-call.c14
-rw-r--r--rest/rest-proxy-call.h3
2 files changed, 3 insertions, 14 deletions
diff --git a/rest/rest-proxy-call.c b/rest/rest-proxy-call.c
index e582ced..ddafb3a 100644
--- a/rest/rest-proxy-call.c
+++ b/rest/rest-proxy-call.c
@@ -579,19 +579,11 @@ _call_async_weak_notify_cb (gpointer *data,
GObject *dead_object)
{
RestProxyCallAsyncClosure *closure;
- GError *error = NULL;
closure = (RestProxyCallAsyncClosure *)data;
/* Will end up freeing the closure */
- rest_proxy_call_cancel (closure->call, &error);
-
- if (error)
- {
- g_warning (G_STRLOC ": Error when cancelling call in weak notify: %s",
- error->message);
- g_clear_error (&error);
- }
+ rest_proxy_call_cancel (closure->call);
}
static void
@@ -741,14 +733,12 @@ error:
/**
* rest_proxy_call_cancel:
* @call: The #RestProxyCall
- * @error: unused (TODO remove)
*
* Cancel this call. It may be too late to not actually send the message, but
* the callback will not be invoked.
*/
gboolean
-rest_proxy_call_cancel (RestProxyCall *call,
- GError **error)
+rest_proxy_call_cancel (RestProxyCall *call)
{
RestProxyCallPrivate *priv;
RestProxyCallAsyncClosure *closure;
diff --git a/rest/rest-proxy-call.h b/rest/rest-proxy-call.h
index 6107661..3360156 100644
--- a/rest/rest-proxy-call.h
+++ b/rest/rest-proxy-call.h
@@ -141,8 +141,7 @@ gboolean rest_proxy_call_async (RestProxyCall *call,
gpointer userdata,
GError **error);
-gboolean rest_proxy_call_cancel (RestProxyCall *call,
- GError **error);
+gboolean rest_proxy_call_cancel (RestProxyCall *call);
gboolean rest_proxy_call_sync (RestProxyCall *call, GError **error_out);