fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-08 18:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

firewall: add arguments to NMFirewallManagerAddRemoveCallback

Browse source 
We should return the target object and the call_id.
This commit is contained in:
Thomas Haller 2015-09-23 17:05:02 +02:00
parent d3a8254681
commit 5bc4d7f0f9
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/devices/nm-device.c
View file

@ -5527,7 +5527,10 @@ out:
static void
fw_change_zone_cb (GError *error, gpointer user_data)
fw_change_zone_cb (NMFirewallManager *firewall_manager,
NMFirewallManagerCallId call_id,
GError *error,
gpointer user_data)
{
NMDevice *self;
NMDevicePrivate *priv;

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

@ -105,7 +105,7 @@ _cb_info_complete_and_free (CBInfo *info,
}
if (info->callback)
info->callback (error, info->user_data);
info->callback (info->self, PENDING_CALL_FROM_INFO (info), error, info->user_data);
g_free (info->iface);
g_object_unref (info->cancellable);

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

@ -58,7 +58,10 @@ GType nm_firewall_manager_get_type (void);
NMFirewallManager *nm_firewall_manager_get (void);
typedef void (*NMFirewallManagerAddRemoveCallback) (GError *error, gpointer user_data);
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,

5
src/vpn-manager/nm-vpn-connection.c
View file

@ -1090,7 +1090,10 @@ _cleanup_failed_config (NMVpnConnection *self)
}
static void
fw_change_zone_cb (GError *error, gpointer user_data)
fw_change_zone_cb (NMFirewallManager *firewall_manager,
NMFirewallManagerCallId call_id,
GError *error,
gpointer user_data)
{
NMVpnConnection *self = NM_VPN_CONNECTION (user_data);
NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self);