diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-09-23 17:05:02 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-09-25 10:34:02 +0200 |
| commit | 5bc4d7f0f95f09939e27e2c056ff49b72de50e6d (patch) | |
| tree | 02325acf613d72c27b89f5fa30996a71cb1760c3 | |
| parent | d3a8254681cbbab864f1e7d5c6ac87a768b323e4 (diff) | |
| download | NetworkManager-5bc4d7f0f95f09939e27e2c056ff49b72de50e6d.tar.gz | |
firewall: add arguments to NMFirewallManagerAddRemoveCallback
We should return the target object and the call_id.
| -rw-r--r-- | src/devices/nm-device.c | 5 | ||||
| -rw-r--r-- | src/nm-firewall-manager.c | 2 | ||||
| -rw-r--r-- | src/nm-firewall-manager.h | 5 | ||||
| -rw-r--r-- | src/vpn-manager/nm-vpn-connection.c | 5 |
4 files changed, 13 insertions, 4 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 1c5ad3e5bc..43ad89e338 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -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; diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index 1418013f9a..e7d8638c9e 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -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); diff --git a/src/nm-firewall-manager.h b/src/nm-firewall-manager.h index fa83e1bcee..92faa360e3 100644 --- a/src/nm-firewall-manager.h +++ b/src/nm-firewall-manager.h @@ -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, diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 2c79de6b0d..60d9c882be 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -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); |