diff options
| author | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:47 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:47 +0100 |
| commit | bed53db3e064450b56e23ec654f40a3bafe58815 (patch) | |
| tree | 314508d6c904b1224dab2070e0cfdd5a02d7dd89 /src/nm-dispatcher.h | |
| parent | 7135a6e87c938139e3a5db121d62dcaa783345d1 (diff) | |
| parent | 58f8be580039b0575b197b9573a1c92745d96d30 (diff) | |
Merge tag 'upstream/1.5.90' into experimental
Upstream version 1.5.90
Diffstat (limited to 'src/nm-dispatcher.h')
| -rw-r--r-- | src/nm-dispatcher.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h index 62818c45..7ea1a6b8 100644 --- a/src/nm-dispatcher.h +++ b/src/nm-dispatcher.h @@ -61,6 +61,7 @@ gboolean nm_dispatcher_call_vpn (DispatcherAction action, NMConnection *applied_connection, NMDevice *parent_device, const char *vpn_iface, + NMProxyConfig *vpn_proxy_config, NMIP4Config *vpn_ip4_config, NMIP6Config *vpn_ip6_config, DispatcherFunc callback, @@ -72,6 +73,7 @@ gboolean nm_dispatcher_call_vpn_sync (DispatcherAction action, NMConnection *applied_connection, NMDevice *parent_device, const char *vpn_iface, + NMProxyConfig *vpn_proxy_config, NMIP4Config *vpn_ip4_config, NMIP6Config *vpn_ip6_config); |