[telepathy-gabble/master] Simplify the code path in lookup_by_name_async.
Mike Ruprecht
mike.ruprecht at collabora.co.uk
Mon Dec 7 07:36:14 PST 2009
---
tests/twisted/test-resolver.c | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/tests/twisted/test-resolver.c b/tests/twisted/test-resolver.c
index 74212e5..b040ec6 100644
--- a/tests/twisted/test-resolver.c
+++ b/tests/twisted/test-resolver.c
@@ -136,26 +136,18 @@ lookup_by_name_async (GResolver *resolver,
GAsyncReadyCallback cb,
gpointer data)
{
- GError *error = NULL;
TestResolver *tr = TEST_RESOLVER (resolver);
GList *addr = find_fake_hosts (tr, hostname);
GObject *source = G_OBJECT (resolver);
- GSimpleAsyncResult *res = NULL;
-
- if (addr == NULL)
- {
- g_set_error (&error,
- G_RESOLVER_ERROR,
- G_RESOLVER_ERROR_NOT_FOUND,
- "No fake hostname record registered");
- }
+ GSimpleAsyncResult *res =
+ g_simple_async_result_new (source, cb, data, lookup_service_async);
if (addr != NULL)
- res = g_simple_async_result_new (source, cb, data, lookup_service_async);
+ g_simple_async_result_set_op_res_gpointer (res, addr, NULL);
else
- res = g_simple_async_result_new_from_error (source, cb, data, error);
+ g_simple_async_result_set_error (res, G_RESOLVER_ERROR,
+ G_RESOLVER_ERROR_NOT_FOUND, "No fake hostname record registered");
- g_simple_async_result_set_op_res_gpointer (res, addr, NULL);
g_simple_async_result_complete_in_idle (res);
g_object_unref (res);
}
--
1.5.6.5
More information about the telepathy-commits
mailing list