fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 19:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device/trivial: rename virtual function NMDevice:unrealize() to unrealize_notify()

Browse source
This commit is contained in:
Thomas Haller 2016-01-10 15:18:31 +01:00
parent 2550850f54
commit ec3613f27c
6 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/devices/nm-device-ip-tunnel.c
View file

@ -790,9 +790,9 @@ ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
}
static void
unrealize (NMDevice *device, gboolean remove_resources)
unrealize_notify (NMDevice *device, gboolean remove_resources)
{
NM_DEVICE_CLASS (nm_device_ip_tunnel_parent_class)->unrealize (device, remove_resources);
NM_DEVICE_CLASS (nm_device_ip_tunnel_parent_class)->unrealize_notify (device, remove_resources);
update_properties_from_ifindex (device, 0);
}
@ -879,7 +879,7 @@ nm_device_ip_tunnel_class_init (NMDeviceIPTunnelClass *klass)
device_class->create_and_realize = create_and_realize;
device_class->ip4_config_pre_commit = ip4_config_pre_commit;
device_class->realize_start_notify = realize_start_notify;
device_class->unrealize = unrealize;
device_class->unrealize_notify = unrealize_notify;
NM_DEVICE_CLASS_DECLARE_TYPES (klass,
NM_SETTING_IP_TUNNEL_SETTING_NAME,

6
src/devices/nm-device-tun.c
View file

@ -337,14 +337,14 @@ ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
}
static void
unrealize (NMDevice *device, gboolean remove_resources)
unrealize_notify (NMDevice *device, gboolean remove_resources)
{
NMDeviceTun *self = NM_DEVICE_TUN (device);
NMDeviceTunPrivate *priv = NM_DEVICE_TUN_GET_PRIVATE (self);
GParamSpec **properties;
guint n_properties, i;
NM_DEVICE_CLASS (nm_device_tun_parent_class)->unrealize (device, remove_resources);
NM_DEVICE_CLASS (nm_device_tun_parent_class)->unrealize_notify (device, remove_resources);
memset (&priv->props, 0, sizeof (NMPlatformTunProperties));
@ -440,7 +440,7 @@ nm_device_tun_class_init (NMDeviceTunClass *klass)
device_class->check_connection_compatible = check_connection_compatible;
device_class->create_and_realize = create_and_realize;
device_class->realize_start_notify = realize_start_notify;
device_class->unrealize = unrealize;
device_class->unrealize_notify = unrealize_notify;
device_class->update_connection = update_connection;
device_class->act_stage1_prepare = act_stage1_prepare;
device_class->ip4_config_pre_commit = ip4_config_pre_commit;

6
src/devices/nm-device-vlan.c
View file

@ -251,9 +251,9 @@ create_and_realize (NMDevice *device,
}
static void
unrealize (NMDevice *device, gboolean remove_resources)
unrealize_notify (NMDevice *device, gboolean remove_resources)
{
NM_DEVICE_CLASS (nm_device_vlan_parent_class)->unrealize (device, remove_resources);
NM_DEVICE_CLASS (nm_device_vlan_parent_class)->unrealize_notify (device, remove_resources);
NM_DEVICE_VLAN_GET_PRIVATE (device)->vlan_id = 0;
g_object_notify (G_OBJECT (device), NM_DEVICE_VLAN_ID);
@ -681,7 +681,7 @@ nm_device_vlan_class_init (NMDeviceVlanClass *klass)
parent_class->create_and_realize = create_and_realize;
parent_class->realize_start_notify = realize_start_notify;
parent_class->unrealize = unrealize;
parent_class->unrealize_notify = unrealize_notify;
parent_class->get_generic_capabilities = get_generic_capabilities;
parent_class->bring_up = bring_up;
parent_class->act_stage1_prepare = act_stage1_prepare;

6
src/devices/nm-device-vxlan.c
View file

@ -155,14 +155,14 @@ realize_start_notify (NMDevice *device, const NMPlatformLink *plink)
}
static void
unrealize (NMDevice *device, gboolean remove_resources)
unrealize_notify (NMDevice *device, gboolean remove_resources)
{
NMDeviceVxlan *self = NM_DEVICE_VXLAN (device);
NMDeviceVxlanPrivate *priv = NM_DEVICE_VXLAN_GET_PRIVATE (self);
GParamSpec **properties;
guint n_properties, i;
NM_DEVICE_CLASS (nm_device_vxlan_parent_class)->unrealize (device, remove_resources);
NM_DEVICE_CLASS (nm_device_vxlan_parent_class)->unrealize_notify (device, remove_resources);
memset (&priv->props, 0, sizeof (NMPlatformLnkVxlan));
@ -657,7 +657,7 @@ nm_device_vxlan_class_init (NMDeviceVxlanClass *klass)
device_class->link_changed = link_changed;
device_class->realize_start_notify = realize_start_notify;
device_class->unrealize = unrealize;
device_class->unrealize_notify = unrealize_notify;
device_class->connection_type = NM_SETTING_VXLAN_SETTING_NAME;
device_class->create_and_realize = create_and_realize;
device_class->check_connection_compatible = check_connection_compatible;

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

@ -1977,7 +1977,7 @@ nm_device_realize_finish (NMDevice *self, const NMPlatformLink *plink)
}
static void
unrealize (NMDevice *self, gboolean remove_resources)
unrealize_notify (NMDevice *self, gboolean remove_resources)
{
int ifindex;
@ -2021,8 +2021,8 @@ nm_device_unrealize (NMDevice *self, gboolean remove_resources, GError **error)
g_object_freeze_notify (G_OBJECT (self));
if (NM_DEVICE_GET_CLASS (self)->unrealize)
NM_DEVICE_GET_CLASS (self)->unrealize (self, remove_resources);
if (NM_DEVICE_GET_CLASS (self)->unrealize_notify)
NM_DEVICE_GET_CLASS (self)->unrealize_notify (self, remove_resources);
if (priv->ifindex > 0) {
priv->ifindex = 0;
@ -10883,7 +10883,7 @@ nm_device_class_init (NMDeviceClass *klass)
klass->check_connection_available = check_connection_available;
klass->can_unmanaged_external_down = can_unmanaged_external_down;
klass->realize_start_notify = realize_start_notify;
klass->unrealize = unrealize;
klass->unrealize_notify = unrealize_notify;
klass->is_up = is_up;
klass->bring_up = bring_up;
klass->take_down = take_down;

4
src/devices/nm-device.h
View file

@ -178,7 +178,7 @@ typedef struct {
void (*realize_start_notify) (NMDevice *self, const NMPlatformLink *plink);
/**
* unrealize():
* unrealize_notify():
* @self: the #NMDevice
* @remove_resources: if %TRUE remove backing resources
* @error: location to store error, or %NULL
@ -186,7 +186,7 @@ typedef struct {
* Clears any properties that depend on backing resources (kernel devices,
* etc) and removes those resources if @remove_resources is %TRUE.
*/
void (*unrealize) (NMDevice *self, gboolean remove_resources);
void (*unrealize_notify) (NMDevice *self, gboolean remove_resources);
/* Hardware state (IFF_UP) */
gboolean (*can_unmanaged_external_down) (NMDevice *self);