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-bridge.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'libnm/nm-device-bridge.c') diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c index c6bf1359..55f09a20 100644 --- a/libnm/nm-device-bridge.c +++ b/libnm/nm-device-bridge.c @@ -27,7 +27,6 @@ #include "nm-utils.h" #include "nm-device-bridge.h" -#include "nm-device-private.h" #include "nm-object-private.h" #include "nm-core-internal.h" @@ -64,7 +63,7 @@ nm_device_bridge_get_hw_address (NMDeviceBridge *device) { g_return_val_if_fail (NM_IS_DEVICE_BRIDGE (device), NULL); - return NM_DEVICE_BRIDGE_GET_PRIVATE (device)->hw_address; + return nm_str_not_empty (NM_DEVICE_BRIDGE_GET_PRIVATE (device)->hw_address); } /** @@ -130,15 +129,13 @@ get_hw_address (NMDevice *device) return nm_device_bridge_get_hw_address (NM_DEVICE_BRIDGE (device)); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_bridge_init (NMDeviceBridge *device) { NMDeviceBridgePrivate *priv = NM_DEVICE_BRIDGE_GET_PRIVATE (device); - _nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_BRIDGE); - priv->slaves = g_ptr_array_new (); } @@ -213,8 +210,6 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *bridge_class) g_type_class_add_private (bridge_class, sizeof (NMDeviceBridgePrivate)); - _nm_object_class_add_interface (nm_object_class, NM_DBUS_INTERFACE_DEVICE_BRIDGE); - /* virtual methods */ object_class->dispose = dispose; object_class->finalize = finalize; -- cgit 1.3.0-6-gf8a5