From ec3613f27c30bfbd0cf1f2c55b1afd5b520dc7de Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 10 Jan 2016 15:18:31 +0100 Subject: device/trivial: rename virtual function NMDevice:unrealize() to unrealize_notify() --- src/devices/nm-device-ip-tunnel.c | 6 +++--- src/devices/nm-device-tun.c | 6 +++--- src/devices/nm-device-vlan.c | 6 +++--- src/devices/nm-device-vxlan.c | 6 +++--- src/devices/nm-device.c | 8 ++++---- src/devices/nm-device.h | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/devices/nm-device-ip-tunnel.c b/src/devices/nm-device-ip-tunnel.c index 11aabcbcad..764c65066e 100644 --- a/src/devices/nm-device-ip-tunnel.c +++ b/src/devices/nm-device-ip-tunnel.c @@ -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, diff --git a/src/devices/nm-device-tun.c b/src/devices/nm-device-tun.c index b62b1beae8..e774bb7b39 100644 --- a/src/devices/nm-device-tun.c +++ b/src/devices/nm-device-tun.c @@ -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; diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index 27112c5a14..6118a5a1fc 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -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; diff --git a/src/devices/nm-device-vxlan.c b/src/devices/nm-device-vxlan.c index aaa26cf06a..32b1681052 100644 --- a/src/devices/nm-device-vxlan.c +++ b/src/devices/nm-device-vxlan.c @@ -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; diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 26a1584a8e..ef3d407719 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -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; diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 7c37be5e4c..75b04cbcc9 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -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); -- cgit v1.2.1