From 0a95f003a9b0cad71d8fcb88562f4050881e0ace Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Tue, 20 Oct 2015 19:41:19 +0200
Subject: [PATCH 1/2] 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)
---
 src/settings/nm-agent-manager.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index 8dcda06..d59173a 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);
 		}
-- 
2.4.3

From 24195884cd953966776074cb6d8df6bf01641845 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Thu, 22 Oct 2015 14:27:45 +0200
Subject: [PATCH 2/2] libnm-glib,vpn-plugin: remove old connect timer when
 adding new one

If the plugin didn't succeed connecting once, don't let the old timer fire
during a subsequent connection.

https://bugzilla.redhat.com/show_bug.cgi?id=1271973
(cherry picked from commit 842889bc5b588d191aa2c2cbcb73452ac8971cf5)
---
 libnm-glib/nm-vpn-plugin.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c
index a9c4a1f..4350e60 100644
--- a/libnm-glib/nm-vpn-plugin.c
+++ b/libnm-glib/nm-vpn-plugin.c
@@ -426,6 +426,7 @@ connect_timer_start (NMVPNPlugin *plugin)
 {
 	NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin);
 
+	nm_clear_g_source (&priv->connect_timer);
 	priv->connect_timer = g_timeout_add_seconds (60, connect_timer_expired, plugin);
 }
 
-- 
2.4.3