firewall/trivial: rename NMFirewallPendingCall to NMFirewallManagerCallId

Matches the naming scheme for other call-ids.

4 files changed, 21 insertions, 21 deletions

diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 928481ec12..1c5ad3e5bc 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -291,7 +291,7 @@ typedef struct {
 	gulong            dnsmasq_state_id;
 
 	/* Firewall */
-	NMFirewallPendingCall fw_call;
+	NMFirewallManagerCallId fw_call;
 
 	/* IPv4LL stuff */
 	sd_ipv4ll *    ipv4ll;
diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c
index 93792b8799..044d48a0d7 100644
--- a/src/nm-firewall-manager.c
+++ b/src/nm-firewall-manager.c
@@ -56,8 +56,8 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 /********************************************************************/
 
-#define PENDING_CALL_DUMMY               ((NMFirewallPendingCall) GUINT_TO_POINTER(1))
-#define PENDING_CALL_FROM_INFO(info)     ((NMFirewallPendingCall) info)
+#define PENDING_CALL_DUMMY               ((NMFirewallManagerCallId) GUINT_TO_POINTER(1))
+#define PENDING_CALL_FROM_INFO(info)     ((NMFirewallManagerCallId) info)
 
 typedef struct {
 	NMFirewallManager *self;
@@ -152,7 +152,7 @@ add_or_change_cb (GObject *proxy, GAsyncResult *result, gpointer user_data)
 	_cb_info_complete_and_free (info, "add/change", "ZONE_ALREADY_SET", error);
 }
 
-NMFirewallPendingCall
+NMFirewallManagerCallId
 nm_firewall_manager_add_or_change_zone (NMFirewallManager *self,
                                         const char *iface,
                                         const char *zone,
@@ -186,7 +186,7 @@ nm_firewall_manager_add_or_change_zone (NMFirewallManager *self,
 	                   G_DBUS_CALL_FLAGS_NONE, 10000,
 	                   info->cancellable,
 	                   add_or_change_cb, info);
-	return (NMFirewallPendingCall) info;
+	return (NMFirewallManagerCallId) info;
 }
 
 static void
@@ -200,7 +200,7 @@ remove_cb (GObject *proxy, GAsyncResult *result, gpointer user_data)
 	_cb_info_complete_and_free (info, "remove", "UNKNOWN_INTERFACE", error);
 }
 
-NMFirewallPendingCall
+NMFirewallManagerCallId
 nm_firewall_manager_remove_from_zone (NMFirewallManager *self,
                                       const char *iface,
                                       const char *zone)
@@ -223,11 +223,11 @@ nm_firewall_manager_remove_from_zone (NMFirewallManager *self,
 	                   G_DBUS_CALL_FLAGS_NONE, 10000,
 	                   info->cancellable,
 	                   remove_cb, info);
-	return (NMFirewallPendingCall) info;
+	return (NMFirewallManagerCallId) info;
 }
 
 void
-nm_firewall_manager_cancel_call (NMFirewallManager *self, NMFirewallPendingCall call)
+nm_firewall_manager_cancel_call (NMFirewallManager *self, NMFirewallManagerCallId call)
 {
 	CBInfo *info = (CBInfo *) call;
 
diff --git a/src/nm-firewall-manager.h b/src/nm-firewall-manager.h
index 19d9689788..a37f2fd6ea 100644
--- a/src/nm-firewall-manager.h
+++ b/src/nm-firewall-manager.h
@@ -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;
@@ -60,16 +60,16 @@ NMFirewallManager *nm_firewall_manager_get (void);
 
 typedef void (*FwAddToZoneFunc) (GError *error, gpointer user_data);
 
-NMFirewallPendingCall nm_firewall_manager_add_or_change_zone (NMFirewallManager *mgr,
+NMFirewallManagerCallId nm_firewall_manager_add_or_change_zone (NMFirewallManager *mgr,
+                                                                const char *iface,
+                                                                const char *zone,
+                                                                gboolean add,
+                                                                FwAddToZoneFunc callback,
+                                                                gpointer user_data);
+NMFirewallManagerCallId nm_firewall_manager_remove_from_zone (NMFirewallManager *mgr,
                                                               const char *iface,
-                                                              const char *zone,
-                                                              gboolean add,
-                                                              FwAddToZoneFunc 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);
+                                                              const char *zone);
+
+void nm_firewall_manager_cancel_call (NMFirewallManager *mgr, NMFirewallManagerCallId fw_call);
 
 #endif /* __NETWORKMANAGER_FIREWALL_MANAGER_H__ */
diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
index 4141d3f7af..2c79de6b0d 100644
--- a/src/vpn-manager/nm-vpn-connection.c
+++ b/src/vpn-manager/nm-vpn-connection.c
@@ -91,7 +91,7 @@ typedef struct {
 	NMVpnServiceState service_state;
 
 	/* Firewall */
-	NMFirewallPendingCall fw_call;
+	NMFirewallManagerCallId fw_call;
 
 	NMDefaultRouteManager *default_route_manager;
 	NMRouteManager *route_manager;