diff options
Diffstat (limited to 'libnm/nm-device-ethernet.c')
| -rw-r--r-- | libnm/nm-device-ethernet.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c index 825ed7b3..727ea8a6 100644 --- a/libnm/nm-device-ethernet.c +++ b/libnm/nm-device-ethernet.c @@ -29,7 +29,6 @@ #include "nm-utils.h" #include "nm-device-ethernet.h" -#include "nm-device-private.h" #include "nm-object-private.h" G_DEFINE_TYPE (NMDeviceEthernet, nm_device_ethernet, NM_TYPE_DEVICE) @@ -69,7 +68,7 @@ nm_device_ethernet_get_hw_address (NMDeviceEthernet *device) { g_return_val_if_fail (NM_IS_DEVICE_ETHERNET (device), NULL); - return NM_DEVICE_ETHERNET_GET_PRIVATE (device)->hw_address; + return nm_str_not_empty (NM_DEVICE_ETHERNET_GET_PRIVATE (device)->hw_address); } /** @@ -86,7 +85,7 @@ nm_device_ethernet_get_permanent_hw_address (NMDeviceEthernet *device) { g_return_val_if_fail (NM_IS_DEVICE_ETHERNET (device), NULL); - return NM_DEVICE_ETHERNET_GET_PRIVATE (device)->perm_hw_address; + return nm_str_not_empty (NM_DEVICE_ETHERNET_GET_PRIVATE (device)->perm_hw_address); } /** @@ -277,12 +276,11 @@ get_hw_address (NMDevice *device) return nm_device_ethernet_get_hw_address (NM_DEVICE_ETHERNET (device)); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_ethernet_init (NMDeviceEthernet *device) { - _nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_ETHERNET); } static void @@ -357,8 +355,6 @@ nm_device_ethernet_class_init (NMDeviceEthernetClass *eth_class) g_type_class_add_private (eth_class, sizeof (NMDeviceEthernetPrivate)); - _nm_object_class_add_interface (nm_object_class, NM_DBUS_INTERFACE_DEVICE_WIRED); - /* virtual methods */ object_class->finalize = finalize; object_class->get_property = get_property; |