From 46ca2ac0eed485bf92007c95f1e2a8d6603b28d5 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 30 Mar 2011 11:58:56 +0200 Subject: async_method_callback_optional: use g_error_matches() Also use early returns to make things easier to read. --- telepathy-farsight/stream.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/telepathy-farsight/stream.c b/telepathy-farsight/stream.c index 8660282..d8e492b 100644 --- a/telepathy-farsight/stream.c +++ b/telepathy-farsight/stream.c @@ -1051,10 +1051,13 @@ async_method_callback_optional (TpMediaStreamHandler *proxy G_GNUC_UNUSED, gpointer user_data, GObject *weak_object) { - if (error != NULL && - !(error->domain == DBUS_GERROR && - error->code == G_DBUS_ERROR_UNKNOWN_METHOD)) - async_method_callback (proxy, error, user_data, weak_object); + if (error == NULL) + return; + + if (g_error_matches (error, DBUS_GERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) + return; + + async_method_callback (proxy, error, user_data, weak_object); } static void -- cgit v1.2.3