From 645ab39bb65eabf3d75871e4f86c240a29363199 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 18 Aug 2014 11:09:29 -0400 Subject: [PATCH] libnm, libnm-glib: fix cut-and-paste-os Several nm-device-*.c files apparently originally used nm-device-ethernet.c as a template, but missed a reference to "eth" in class_init. --- libnm-glib/nm-device-bond.c | 8 ++++---- libnm-glib/nm-device-infiniband.c | 8 ++++---- libnm-glib/nm-device-team.c | 8 ++++---- libnm-glib/nm-device-vlan.c | 8 ++++---- libnm/nm-device-bond.c | 10 +++++----- libnm/nm-device-infiniband.c | 10 +++++----- libnm/nm-device-team.c | 10 +++++----- libnm/nm-device-vlan.c | 10 +++++----- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c index 662b2f4a38..0529ccb932 100644 --- a/libnm-glib/nm-device-bond.c +++ b/libnm-glib/nm-device-bond.c @@ -289,12 +289,12 @@ get_property (GObject *object, } static void -nm_device_bond_class_init (NMDeviceBondClass *eth_class) +nm_device_bond_class_init (NMDeviceBondClass *bond_class) { - GObjectClass *object_class = G_OBJECT_CLASS (eth_class); - NMDeviceClass *device_class = NM_DEVICE_CLASS (eth_class); + GObjectClass *object_class = G_OBJECT_CLASS (bond_class); + NMDeviceClass *device_class = NM_DEVICE_CLASS (bond_class); - g_type_class_add_private (eth_class, sizeof (NMDeviceBondPrivate)); + g_type_class_add_private (bond_class, sizeof (NMDeviceBondPrivate)); /* virtual methods */ object_class->constructed = constructed; diff --git a/libnm-glib/nm-device-infiniband.c b/libnm-glib/nm-device-infiniband.c index d740ed006e..3aa6e03ab5 100644 --- a/libnm-glib/nm-device-infiniband.c +++ b/libnm-glib/nm-device-infiniband.c @@ -266,12 +266,12 @@ get_property (GObject *object, } static void -nm_device_infiniband_class_init (NMDeviceInfinibandClass *eth_class) +nm_device_infiniband_class_init (NMDeviceInfinibandClass *ib_class) { - GObjectClass *object_class = G_OBJECT_CLASS (eth_class); - NMDeviceClass *device_class = NM_DEVICE_CLASS (eth_class); + GObjectClass *object_class = G_OBJECT_CLASS (ib_class); + NMDeviceClass *device_class = NM_DEVICE_CLASS (ib_class); - g_type_class_add_private (eth_class, sizeof (NMDeviceInfinibandPrivate)); + g_type_class_add_private (ib_class, sizeof (NMDeviceInfinibandPrivate)); /* virtual methods */ object_class->constructed = constructed; diff --git a/libnm-glib/nm-device-team.c b/libnm-glib/nm-device-team.c index c9ac2d8b85..e9ff548c35 100644 --- a/libnm-glib/nm-device-team.c +++ b/libnm-glib/nm-device-team.c @@ -297,12 +297,12 @@ get_property (GObject *object, } static void -nm_device_team_class_init (NMDeviceTeamClass *eth_class) +nm_device_team_class_init (NMDeviceTeamClass *team_class) { - GObjectClass *object_class = G_OBJECT_CLASS (eth_class); - NMDeviceClass *device_class = NM_DEVICE_CLASS (eth_class); + GObjectClass *object_class = G_OBJECT_CLASS (team_class); + NMDeviceClass *device_class = NM_DEVICE_CLASS (team_class); - g_type_class_add_private (eth_class, sizeof (NMDeviceTeamPrivate)); + g_type_class_add_private (team_class, sizeof (NMDeviceTeamPrivate)); /* virtual methods */ object_class->constructed = constructed; diff --git a/libnm-glib/nm-device-vlan.c b/libnm-glib/nm-device-vlan.c index 8df3025ebb..93bf12763b 100644 --- a/libnm-glib/nm-device-vlan.c +++ b/libnm-glib/nm-device-vlan.c @@ -297,12 +297,12 @@ get_property (GObject *object, } static void -nm_device_vlan_class_init (NMDeviceVlanClass *eth_class) +nm_device_vlan_class_init (NMDeviceVlanClass *vlan_class) { - GObjectClass *object_class = G_OBJECT_CLASS (eth_class); - NMDeviceClass *device_class = NM_DEVICE_CLASS (eth_class); + GObjectClass *object_class = G_OBJECT_CLASS (vlan_class); + NMDeviceClass *device_class = NM_DEVICE_CLASS (vlan_class); - g_type_class_add_private (eth_class, sizeof (NMDeviceVlanPrivate)); + g_type_class_add_private (vlan_class, sizeof (NMDeviceVlanPrivate)); /* virtual methods */ object_class->constructed = constructed; diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c index 73aedcff4e..46f254380f 100644 --- a/libnm/nm-device-bond.c +++ b/libnm/nm-device-bond.c @@ -248,13 +248,13 @@ get_property (GObject *object, } static void -nm_device_bond_class_init (NMDeviceBondClass *eth_class) +nm_device_bond_class_init (NMDeviceBondClass *bond_class) { - GObjectClass *object_class = G_OBJECT_CLASS (eth_class); - NMObjectClass *nm_object_class = NM_OBJECT_CLASS (eth_class); - NMDeviceClass *device_class = NM_DEVICE_CLASS (eth_class); + GObjectClass *object_class = G_OBJECT_CLASS (bond_class); + NMObjectClass *nm_object_class = NM_OBJECT_CLASS (bond_class); + NMDeviceClass *device_class = NM_DEVICE_CLASS (bond_class); - g_type_class_add_private (eth_class, sizeof (NMDeviceBondPrivate)); + g_type_class_add_private (bond_class, sizeof (NMDeviceBondPrivate)); /* virtual methods */ object_class->dispose = dispose; diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c index 970e307c04..c196b0b84b 100644 --- a/libnm/nm-device-infiniband.c +++ b/libnm/nm-device-infiniband.c @@ -224,13 +224,13 @@ get_property (GObject *object, } static void -nm_device_infiniband_class_init (NMDeviceInfinibandClass *eth_class) +nm_device_infiniband_class_init (NMDeviceInfinibandClass *ib_class) { - GObjectClass *object_class = G_OBJECT_CLASS (eth_class); - NMObjectClass *nm_object_class = NM_OBJECT_CLASS (eth_class); - NMDeviceClass *device_class = NM_DEVICE_CLASS (eth_class); + GObjectClass *object_class = G_OBJECT_CLASS (ib_class); + NMObjectClass *nm_object_class = NM_OBJECT_CLASS (ib_class); + NMDeviceClass *device_class = NM_DEVICE_CLASS (ib_class); - g_type_class_add_private (eth_class, sizeof (NMDeviceInfinibandPrivate)); + g_type_class_add_private (ib_class, sizeof (NMDeviceInfinibandPrivate)); /* virtual methods */ object_class->dispose = dispose; diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c index 1ce91ba41b..892d551666 100644 --- a/libnm/nm-device-team.c +++ b/libnm/nm-device-team.c @@ -248,13 +248,13 @@ get_property (GObject *object, } static void -nm_device_team_class_init (NMDeviceTeamClass *eth_class) +nm_device_team_class_init (NMDeviceTeamClass *team_class) { - GObjectClass *object_class = G_OBJECT_CLASS (eth_class); - NMObjectClass *nm_object_class = NM_OBJECT_CLASS (eth_class); - NMDeviceClass *device_class = NM_DEVICE_CLASS (eth_class); + GObjectClass *object_class = G_OBJECT_CLASS (team_class); + NMObjectClass *nm_object_class = NM_OBJECT_CLASS (team_class); + NMDeviceClass *device_class = NM_DEVICE_CLASS (team_class); - g_type_class_add_private (eth_class, sizeof (NMDeviceTeamPrivate)); + g_type_class_add_private (team_class, sizeof (NMDeviceTeamPrivate)); /* virtual methods */ object_class->dispose = dispose; diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c index 992d1188ad..6a331fcd78 100644 --- a/libnm/nm-device-vlan.c +++ b/libnm/nm-device-vlan.c @@ -258,13 +258,13 @@ get_property (GObject *object, } static void -nm_device_vlan_class_init (NMDeviceVlanClass *eth_class) +nm_device_vlan_class_init (NMDeviceVlanClass *vlan_class) { - GObjectClass *object_class = G_OBJECT_CLASS (eth_class); - NMObjectClass *nm_object_class = NM_OBJECT_CLASS (eth_class); - NMDeviceClass *device_class = NM_DEVICE_CLASS (eth_class); + GObjectClass *object_class = G_OBJECT_CLASS (vlan_class); + NMObjectClass *nm_object_class = NM_OBJECT_CLASS (vlan_class); + NMDeviceClass *device_class = NM_DEVICE_CLASS (vlan_class); - g_type_class_add_private (eth_class, sizeof (NMDeviceVlanPrivate)); + g_type_class_add_private (vlan_class, sizeof (NMDeviceVlanPrivate)); /* virtual methods */ object_class->dispose = dispose;