From 2ca7c892988bfc5f0ac68d69a03faf13256872bb Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 12 Feb 2014 11:04:31 +0100 Subject: [PATCH] core: fix hanging set_logging() dbus call by returning a result Signed-off-by: Thomas Haller --- src/nm-manager.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index 925525663a..8d37f4b68c 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4100,9 +4100,11 @@ impl_manager_set_logging (NMManager *manager, } done: - if (error) + if (error) { dbus_g_method_return_error (context, error); - g_clear_error (&error); + g_error_free (error); + } else + dbus_g_method_return (context); } static void