diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-10-01 17:17:52 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-10-01 17:17:52 +0200 |
| commit | b1512221bc29f24b86d464dc5117439c366fd299 (patch) | |
| tree | 5353c91f719b1c8f1f908179edb5b96af4ca9fbc | |
| parent | d4a7645865c91f08261ca0a5fac72e6bab7576ab (diff) | |
| download | NetworkManager-b1512221bc29f24b86d464dc5117439c366fd299.tar.gz | |
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.
| -rw-r--r-- | libnm-glib/nm-vpn-plugin.c | 2 | ||||
| -rw-r--r-- | libnm/nm-vpn-plugin-old.c | 2 | ||||
| -rw-r--r-- | libnm/nm-vpn-service-plugin.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index 6a728f9ebf..0894fa9095 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 f31daab033..cfc8c66349 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -37,7 +37,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); diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index d272d8c8dd..fc4cfdc038 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -38,7 +38,7 @@ #include "nmdbus-vpn-plugin.h" -#define NM_VPN_SERVICE_PLUGIN_QUIT_TIMER 20 +#define NM_VPN_SERVICE_PLUGIN_QUIT_TIMER 180 static void nm_vpn_service_plugin_initable_iface_init (GInitableIface *iface); |