diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-07-05 13:43:06 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-07-05 23:08:23 +0200 |
| commit | 6036ef5d74ea378c5aa94894d17fc5019a79581e (patch) | |
| tree | fee43fc436d559f8151871c5390f68fc5f644dd4 | |
| parent | 46b452eb5a1c680646cf93a9f53c456426676e87 (diff) | |
| download | NetworkManager-6036ef5d74ea378c5aa94894d17fc5019a79581e.tar.gz | |
ethernet: implement NMDeviceEthernet's properties via NM_GOBJECT_PROPERTIES_DEFINE()
| -rw-r--r-- | src/devices/nm-device-ethernet.c | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index b15547b129..0af0695074 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -118,13 +118,10 @@ typedef struct _NMDeviceEthernetPrivate { gulong dcb_carrier_id; } NMDeviceEthernetPrivate; -enum { - PROP_0, +NM_GOBJECT_PROPERTIES_DEFINE (NMDeviceEthernet, PROP_SPEED, PROP_S390_SUBCHANNELS, - - LAST_PROP -}; +); /*****************************************************************************/ @@ -1530,7 +1527,7 @@ get_link_speed (NMDevice *device) return; priv->speed = speed; - g_object_notify (G_OBJECT (device), "speed"); + _notify (self, PROP_SPEED); _LOGD (LOGD_HW | LOGD_ETHER, "speed is now %d Mb/s", speed); } @@ -1664,20 +1661,19 @@ nm_device_ethernet_class_init (NMDeviceEthernetClass *klass) parent_class->state_changed = device_state_changed; - /* properties */ - g_object_class_install_property - (object_class, PROP_SPEED, - g_param_spec_uint (NM_DEVICE_ETHERNET_SPEED, "", "", - 0, G_MAXUINT32, 0, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS)); - - g_object_class_install_property - (object_class, PROP_S390_SUBCHANNELS, - g_param_spec_boxed (NM_DEVICE_ETHERNET_S390_SUBCHANNELS, "", "", - G_TYPE_STRV, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS)); + obj_properties[PROP_SPEED] = + g_param_spec_uint (NM_DEVICE_ETHERNET_SPEED, "", "", + 0, G_MAXUINT32, 0, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); + + obj_properties[PROP_S390_SUBCHANNELS] = + g_param_spec_boxed (NM_DEVICE_ETHERNET_S390_SUBCHANNELS, "", "", + G_TYPE_STRV, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); + + g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass), NMDBUS_TYPE_DEVICE_ETHERNET_SKELETON, |