system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-09-20 00:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

firewall/trivial: rename FwAddToZoneFunc to NMFirewallManagerAddRemoveCallback

Browse source 
Give it a proper NMFirewallManager* prefix to make it clear where the type belongs.
Also, we will add a similar callback for nm_firewall_manager_remove_from_zone(),
so reflect that in the name.
This commit is contained in:
Thomas Haller 2015-09-23 16:43:22 +02:00
parent 0d33b73e42
commit d3a8254681
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/nm-firewall-manager.c
View file

@ -62,7 +62,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
typedef struct {
NMFirewallManager *self;
char *iface;
FwAddToZoneFunc callback;
NMFirewallManagerAddRemoveCallback callback;
gpointer user_data;
guint id;
@ -113,7 +113,7 @@ _cb_info_complete_and_free (CBInfo *info,
}
static CBInfo *
_cb_info_create (NMFirewallManager *self, const char *iface, FwAddToZoneFunc callback, gpointer user_data)
_cb_info_create (NMFirewallManager *self, const char *iface, NMFirewallManagerAddRemoveCallback callback, gpointer user_data)
{
NMFirewallManagerPrivate *priv = NM_FIREWALL_MANAGER_GET_PRIVATE (self);
static guint id = 1;
@ -157,7 +157,7 @@ nm_firewall_manager_add_or_change_zone (NMFirewallManager *self,
const char *iface,
const char *zone,
gboolean add, /* TRUE == add, FALSE == change */
FwAddToZoneFunc callback,
NMFirewallManagerAddRemoveCallback callback,
gpointer user_data)
{
NMFirewallManagerPrivate *priv = NM_FIREWALL_MANAGER_GET_PRIVATE (self);

4
src/nm-firewall-manager.h
View file

@ -58,13 +58,13 @@ GType nm_firewall_manager_get_type (void);
NMFirewallManager *nm_firewall_manager_get (void);
typedef void (*FwAddToZoneFunc) (GError *error, gpointer user_data);
typedef void (*NMFirewallManagerAddRemoveCallback) (GError *error, gpointer user_data);
NMFirewallManagerCallId nm_firewall_manager_add_or_change_zone (NMFirewallManager *mgr,
const char *iface,
const char *zone,
gboolean add,
FwAddToZoneFunc callback,
NMFirewallManagerAddRemoveCallback callback,
gpointer user_data);
NMFirewallManagerCallId nm_firewall_manager_remove_from_zone (NMFirewallManager *mgr,
const char *iface,