From cc9e64ba9d1a8aa6577d77c2c07eea85c14999ec Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 2 Nov 2012 11:09:03 +0100 Subject: [PATCH] e_async_closure_callback: Do not test 'object' parameter validity It is unnecessary to test validity of the 'object' parameter, especially when this callback does nothing with it. The reason is that the secret_password_store() calls the callback with NULL 'object', which leads to a deadlock on the source registry side. --- libedataserver/e-data-server-util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c index 77262d6..e5539be 100644 --- a/libedataserver/e-data-server-util.c +++ b/libedataserver/e-data-server-util.c @@ -1369,7 +1369,7 @@ e_async_closure_free (EAsyncClosure *closure) /** * e_async_closure_callback: - * @object: a #GObject + * @object: a #GObject or %NULL, it is not used by the function at all * @result: a #GAsyncResult * @closure: an #EAsyncClosure * @@ -1387,7 +1387,6 @@ e_async_closure_callback (GObject *object, { EAsyncClosure *real_closure; - g_return_if_fail (G_IS_OBJECT (object)); g_return_if_fail (G_IS_ASYNC_RESULT (result)); g_return_if_fail (closure != NULL); -- 2.7.4