diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-10-20 19:41:19 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-10-23 18:22:03 +0200 |
| commit | 0a95f003a9b0cad71d8fcb88562f4050881e0ace (patch) | |
| tree | c2a4075c735be3189daec936390f77e98f6d8a82 | |
| parent | 48111a08280a46604ee5229622108c2966a252a1 (diff) | |
| download | NetworkManager-0a95f003a9b0cad71d8fcb88562f4050881e0ace.tar.gz | |
agent-manager: cancel secrets requests on an error
It might be that the user didn't supply the secrets in time and the dbus call
timed out. The agent should now hide the secrets dialog and we must let it know.
https://bugzilla.redhat.com/show_bug.cgi?id=1272023
(cherry picked from commit 5d1cac81a0bcc66b891bc38f1a2cc4b84d47f08b)
| -rw-r--r-- | src/settings/nm-agent-manager.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index 8dcda06db7..d59173ae76 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -816,6 +816,9 @@ get_done_cb (NMSecretAgent *agent, req_complete_error (parent, error); g_error_free (error); } else { + /* Tell the failed agent we're no longer interested. */ + nm_secret_agent_cancel_secrets (parent->current, parent->current_call_id); + /* Try the next agent */ request_next_agent (parent); } |