diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-30 00:57:20 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-30 00:57:20 +0200 |
| commit | db70f92a77334e84ca9a04379afd49ea55c53098 (patch) | |
| tree | d91e6ec27d66ec3c5a20c9195a0eb1d834189618 /src/settings/nm-agent-manager.c | |
| parent | 4a76b5857faa586add8d7ce28f7804ffb65f3c68 (diff) | |
| parent | d9c99a29a0d3384c9c3d2adce430f5cb1134ab6a (diff) | |
Merge tag 'upstream/1.1.92'
Upstream version 1.1.92
Diffstat (limited to 'src/settings/nm-agent-manager.c')
| -rw-r--r-- | src/settings/nm-agent-manager.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index bc09e031..48a7da7b 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -263,8 +263,8 @@ agent_register_permissions_done (NMAuthChain *chain, if (error) { local = g_error_new (NM_AGENT_MANAGER_ERROR, NM_AGENT_MANAGER_ERROR_PERMISSION_DENIED, - "Failed to request agent permissions: (%d) %s", - error->code, error->message); + "Failed to request agent permissions: %s", + error->message); g_dbus_method_invocation_take_error (context, local); } else { agent = nm_auth_chain_steal_data (chain, "agent"); @@ -930,6 +930,7 @@ set_secrets_not_required (NMConnection *connection, GVariant *dict) g_variant_unref (val); } } + g_variant_unref (setting_dict); } } @@ -987,9 +988,9 @@ _con_get_request_start_validated (NMAuthChain *chain, req->con.chain = NULL; if (error) { - _LOGD (req->current, "agent "LOG_REQ_FMT" MODIFY check error: (%d) %s", + _LOGD (req->current, "agent "LOG_REQ_FMT" MODIFY check error: %s", LOG_REQ_ARG (req), - error->code, error->message ? error->message : "(unknown)"); + error->message); /* Try the next agent */ request_next_agent (req); } else { |