From 494f296a3baab08522617b24b1f126d8f9a17502 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 20 Jan 2016 16:26:51 +0100 Subject: Imported Upstream version 1.1.90 --- src/nm-dispatcher.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/nm-dispatcher.h') diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h index e93816b6..42dcdc46 100644 --- a/src/nm-dispatcher.h +++ b/src/nm-dispatcher.h @@ -22,10 +22,9 @@ #ifndef __NETWORKMANAGER_DISPATCHER_H__ #define __NETWORKMANAGER_DISPATCHER_H__ -#include #include -#include "nm-types.h" +#include "nm-default.h" #include "nm-connection.h" typedef enum { @@ -45,18 +44,21 @@ typedef enum { typedef void (*DispatcherFunc) (guint call_id, gpointer user_data); gboolean nm_dispatcher_call (DispatcherAction action, - NMConnection *connection, + NMSettingsConnection *settings_connection, + NMConnection *applied_connection, NMDevice *device, DispatcherFunc callback, gpointer user_data, guint *out_call_id); gboolean nm_dispatcher_call_sync (DispatcherAction action, - NMConnection *connection, + NMSettingsConnection *settings_connection, + NMConnection *applied_connection, NMDevice *device); gboolean nm_dispatcher_call_vpn (DispatcherAction action, - NMConnection *connection, + NMSettingsConnection *settings_connection, + NMConnection *applied_connection, NMDevice *parent_device, const char *vpn_iface, NMIP4Config *vpn_ip4_config, @@ -66,7 +68,8 @@ gboolean nm_dispatcher_call_vpn (DispatcherAction action, guint *out_call_id); gboolean nm_dispatcher_call_vpn_sync (DispatcherAction action, - NMConnection *connection, + NMSettingsConnection *settings_connection, + NMConnection *applied_connection, NMDevice *parent_device, const char *vpn_iface, NMIP4Config *vpn_ip4_config, -- cgit 1.3.0-6-gf8a5