From f7617511bb94bbae2dbf99231a7d6be29575aa4d Mon Sep 17 00:00:00 2001

From: Lubomir Rintel <lkundrak@v3.sk>

Date: Thu, 1 Oct 2015 17:17:52 +0200

Subject: [PATCH] nm-vpn-service-plugin: increase the quit timer

We now (since 3272ff6 libnm/libnm-glib: don't quit in the middle of asking for

secrets) always hook on the quit timer when NM asks the plugin if it needs

secrets. The timer is 20 seconds, which seems too short.

Let's make it three minutes. Don't bother adding another timer or using a

distinct timeout: it does no harm for the plugin to remain unused for three

minutes on a bus.

Another option would be to completely unhook it; however the plugin wouldn't

learn if the user cancelled the NM's secrets request and would remain unused

on the bus forever.

(cherry picked from commit b1512221bc29f24b86d464dc5117439c366fd299)

---

 libnm-glib/nm-vpn-plugin.c | 2 +-

 libnm/nm-vpn-plugin-old.c  | 2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c

index f40ea80..a9c4a1f 100644

--- a/libnm-glib/nm-vpn-plugin.c

+++ b/libnm-glib/nm-vpn-plugin.c

@@ -69,7 +69,7 @@ static gboolean impl_vpn_plugin_set_failure (NMVPNPlugin *plugin,

 #include "nm-vpn-plugin-glue.h"

-#define NM_VPN_PLUGIN_QUIT_TIMER    20

+#define NM_VPN_PLUGIN_QUIT_TIMER    180

 G_DEFINE_ABSTRACT_TYPE (NMVPNPlugin, nm_vpn_plugin, G_TYPE_OBJECT)

diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c

index 24d8e40..deaa07d 100644

--- a/libnm/nm-vpn-plugin-old.c

+++ b/libnm/nm-vpn-plugin-old.c

@@ -44,7 +44,7 @@

 #include "nmdbus-vpn-plugin.h"

-#define NM_VPN_PLUGIN_OLD_QUIT_TIMER    20

+#define NM_VPN_PLUGIN_OLD_QUIT_TIMER    180

 static void nm_vpn_plugin_old_initable_iface_init (GInitableIface *iface);

-- 

2.4.3