From 58f8be580039b0575b197b9573a1c92745d96d30 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 17 Jan 2017 20:25:09 +0100 Subject: New upstream version 1.5.90 --- libnm/nm-device-team.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'libnm/nm-device-team.c') diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c index 3955e105..0b62b864 100644 --- a/libnm/nm-device-team.c +++ b/libnm/nm-device-team.c @@ -27,7 +27,6 @@ #include "nm-utils.h" #include "nm-device-team.h" -#include "nm-device-private.h" #include "nm-object-private.h" #include "nm-core-internal.h" @@ -66,7 +65,7 @@ nm_device_team_get_hw_address (NMDeviceTeam *device) { g_return_val_if_fail (NM_IS_DEVICE_TEAM (device), NULL); - return NM_DEVICE_TEAM_GET_PRIVATE (device)->hw_address; + return nm_str_not_empty (NM_DEVICE_TEAM_GET_PRIVATE (device)->hw_address); } /** @@ -119,7 +118,7 @@ nm_device_team_get_config (NMDeviceTeam *device) { g_return_val_if_fail (NM_IS_DEVICE_TEAM (device), NULL); - return NM_DEVICE_TEAM_GET_PRIVATE (device)->config; + return nm_str_not_empty (NM_DEVICE_TEAM_GET_PRIVATE (device)->config); } static const char * @@ -151,15 +150,13 @@ get_setting_type (NMDevice *device) return NM_TYPE_SETTING_TEAM; } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_team_init (NMDeviceTeam *device) { NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (device); - _nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_TEAM); - priv->slaves = g_ptr_array_new (); } @@ -239,8 +236,6 @@ nm_device_team_class_init (NMDeviceTeamClass *team_class) g_type_class_add_private (team_class, sizeof (NMDeviceTeamPrivate)); - _nm_object_class_add_interface (nm_object_class, NM_DBUS_INTERFACE_DEVICE_TEAM); - /* virtual methods */ object_class->dispose = dispose; object_class->finalize = finalize; -- cgit 1.3.0-6-gf8a5