diff options
Diffstat (limited to 'libnm/nm-device-macvlan.c')
| -rw-r--r-- | libnm/nm-device-macvlan.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libnm/nm-device-macvlan.c b/libnm/nm-device-macvlan.c index 825c9197..e6477219 100644 --- a/libnm/nm-device-macvlan.c +++ b/libnm/nm-device-macvlan.c @@ -28,7 +28,6 @@ #include "nm-utils.h" #include "nm-device-macvlan.h" -#include "nm-device-private.h" #include "nm-object-private.h" G_DEFINE_TYPE (NMDeviceMacvlan, nm_device_macvlan, NM_TYPE_DEVICE) @@ -86,7 +85,7 @@ nm_device_macvlan_get_mode (NMDeviceMacvlan *device) { g_return_val_if_fail (NM_IS_DEVICE_MACVLAN (device), NULL); - return NM_DEVICE_MACVLAN_GET_PRIVATE (device)->mode; + return nm_str_not_empty (NM_DEVICE_MACVLAN_GET_PRIVATE (device)->mode); } /** @@ -141,7 +140,7 @@ nm_device_macvlan_get_hw_address (NMDeviceMacvlan *device) { g_return_val_if_fail (NM_IS_DEVICE_MACVLAN (device), NULL); - return NM_DEVICE_MACVLAN_GET_PRIVATE (device)->hw_address; + return nm_str_not_empty (NM_DEVICE_MACVLAN_GET_PRIVATE (device)->hw_address); } @@ -181,12 +180,11 @@ get_setting_type (NMDevice *device) return NM_TYPE_SETTING_MACVLAN; } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_macvlan_init (NMDeviceMacvlan *device) { - _nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_MACVLAN); } static void @@ -260,8 +258,6 @@ nm_device_macvlan_class_init (NMDeviceMacvlanClass *gre_class) g_type_class_add_private (gre_class, sizeof (NMDeviceMacvlanPrivate)); - _nm_object_class_add_interface (nm_object_class, NM_DBUS_INTERFACE_DEVICE_MACVLAN); - /* virtual methods */ object_class->finalize = finalize; object_class->get_property = get_property; |