From f1300897350034f4f3baf8d73568e9f4aea7ec71 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 30 Jan 2011 13:53:37 -0600 Subject: [PATCH] settings: use less memory in error handling of GetSecrets --- src/settings/nm-settings-connection.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 60a6deff7b..e0b079d394 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -793,9 +793,7 @@ dbus_secrets_auth_cb (NMSettingsConnection *self, guint32 call_id = 0; GError *local = NULL; - if (error) - local = g_error_copy (error); - else { + if (!error) { call_id = nm_settings_connection_get_secrets (self, TRUE, sender_uid, @@ -811,7 +809,7 @@ dbus_secrets_auth_cb (NMSettingsConnection *self, } } - if (local) { + if (error || local) { dbus_g_method_return_error (context, error ? error : local); g_clear_error (&local); }