diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-09-23 16:43:22 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-09-25 10:34:02 +0200 |
| commit | d3a8254681cbbab864f1e7d5c6ac87a768b323e4 (patch) | |
| tree | f43b5598b84fcecae7a716d7a91d0b2960c37d1a | |
| parent | 0d33b73e425a7c8cb465443068f5dcbac6c0a29d (diff) | |
| download | NetworkManager-d3a8254681cbbab864f1e7d5c6ac87a768b323e4.tar.gz | |
firewall/trivial: rename FwAddToZoneFunc to NMFirewallManagerAddRemoveCallback
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.
| -rw-r--r-- | src/nm-firewall-manager.c | 6 | ||||
| -rw-r--r-- | src/nm-firewall-manager.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index 044d48a0d7..1418013f9a 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -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); diff --git a/src/nm-firewall-manager.h b/src/nm-firewall-manager.h index a37f2fd6ea..fa83e1bcee 100644 --- a/src/nm-firewall-manager.h +++ b/src/nm-firewall-manager.h @@ -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, |