From 42c41d326e025c1b043bd4dfeb157d356580164e Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 17 Aug 2011 19:28:04 +0100 Subject: [PATCH 2/2] invoke_object_method: simplify how we return Based on review feedback from Cosimo. --- dbus/dbus-gobject.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c index ec46412..78fb24c 100644 --- a/dbus/dbus-gobject.c +++ b/dbus/dbus-gobject.c @@ -1669,7 +1669,6 @@ invoke_object_method (GObject *object, GValueArray *out_param_gvalues = NULL; int out_param_count; int out_param_pos, out_param_gvalue_pos; - DBusHandlerResult result; DBusMessage *reply = NULL; gboolean have_retval; gboolean retval_signals_error; @@ -2017,8 +2016,6 @@ invoke_object_method (GObject *object, } done: - result = DBUS_HANDLER_RESULT_HANDLED; - g_free (in_signature); if (!is_async) @@ -2031,7 +2028,7 @@ done: g_clear_error (&gerror); g_value_array_free (value_array); - return result; + return DBUS_HANDLER_RESULT_HANDLED; } /* -- 1.7.5.4