diff options
| author | Jeremy Bicha <jbicha@ubuntu.com> | 2018-05-11 19:02:28 -0400 |
|---|---|---|
| committer | Jeremy Bicha <jbicha@ubuntu.com> | 2018-05-11 19:02:28 -0400 |
| commit | ee7f1100500dc431a6e8bf1e6efb2d41445fd28f (patch) | |
| tree | 3eef32d0e8412f4d2126a9be5820c85d387e313c /libnm | |
| parent | 01bf2f7e474588126875a29125a1e248d7ae18db (diff) | |
| parent | 680d3db45106e7a18665a366e1b57e58cef61506 (diff) | |
Merge tag 'debian/1.10.8-1' into cosmic
network-manager Debian release 1.10.8-1
Diffstat (limited to 'libnm')
| -rw-r--r-- | libnm/nm-vpn-plugin-old.c | 10 | ||||
| -rw-r--r-- | libnm/nm-vpn-service-plugin.c | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index 2b5922b9..897f6d40 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -905,9 +905,17 @@ impl_vpn_plugin_old_set_failure (NMVpnPluginOld *plugin, /*****************************************************************************/ static void +_emit_quit (gpointer data, gpointer user_data) +{ + NMVpnPluginOld *plugin = data; + + nm_vpn_plugin_old_emit_quit (plugin); +} + +static void sigterm_handler (int signum) { - g_slist_foreach (active_plugins, (GFunc) nm_vpn_plugin_old_emit_quit, NULL); + g_slist_foreach (active_plugins, _emit_quit, NULL); } static void diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 0a785396..bf289375 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -927,9 +927,17 @@ impl_vpn_service_plugin_set_failure (NMVpnServicePlugin *plugin, /*****************************************************************************/ static void +_emit_quit (gpointer data, gpointer user_data) +{ + NMVpnServicePlugin *plugin = data; + + nm_vpn_service_plugin_emit_quit (plugin); +} + +static void sigterm_handler (int signum) { - g_slist_foreach (active_plugins, (GFunc) nm_vpn_service_plugin_emit_quit, NULL); + g_slist_foreach (active_plugins, _emit_quit, NULL); } static void |