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-firewall-manager.h | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'src/nm-firewall-manager.h') diff --git a/src/nm-firewall-manager.h b/src/nm-firewall-manager.h index 84cb5498..dfa83b45 100644 --- a/src/nm-firewall-manager.h +++ b/src/nm-firewall-manager.h @@ -21,7 +21,7 @@ #ifndef __NETWORKMANAGER_FIREWALL_MANAGER_H__ #define __NETWORKMANAGER_FIREWALL_MANAGER_H__ -#include +#include "nm-default.h" #define FIREWALL_DBUS_SERVICE "org.fedoraproject.FirewallD1" #define FIREWALL_DBUS_PATH "/org/fedoraproject/FirewallD1" @@ -40,8 +40,8 @@ G_BEGIN_DECLS #define NM_FIREWALL_MANAGER_AVAILABLE "available" -struct _NMFirewallPendingCall; -typedef struct _NMFirewallPendingCall *NMFirewallPendingCall; +struct _NMFirewallManagerCallId; +typedef struct _NMFirewallManagerCallId *NMFirewallManagerCallId; typedef struct { GObject parent; @@ -58,18 +58,23 @@ GType nm_firewall_manager_get_type (void); NMFirewallManager *nm_firewall_manager_get (void); -typedef void (*FwAddToZoneFunc) (GError *error, gpointer user_data); - -NMFirewallPendingCall nm_firewall_manager_add_or_change_zone (NMFirewallManager *mgr, +typedef void (*NMFirewallManagerAddRemoveCallback) (NMFirewallManager *self, + NMFirewallManagerCallId call_id, + GError *error, + gpointer user_data); + +NMFirewallManagerCallId nm_firewall_manager_add_or_change_zone (NMFirewallManager *mgr, + const char *iface, + const char *zone, + gboolean add, + NMFirewallManagerAddRemoveCallback callback, + gpointer user_data); +NMFirewallManagerCallId nm_firewall_manager_remove_from_zone (NMFirewallManager *mgr, const char *iface, const char *zone, - gboolean add, - FwAddToZoneFunc callback, + NMFirewallManagerAddRemoveCallback callback, gpointer user_data); -NMFirewallPendingCall nm_firewall_manager_remove_from_zone (NMFirewallManager *mgr, - const char *iface, - const char *zone); -void nm_firewall_manager_cancel_call (NMFirewallManager *mgr, NMFirewallPendingCall fw_call); +void nm_firewall_manager_cancel_call (NMFirewallManagerCallId fw_call); #endif /* __NETWORKMANAGER_FIREWALL_MANAGER_H__ */ -- cgit 1.3.0-6-gf8a5