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-bt.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'libnm/nm-device-bt.c') diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c index dc28ad89..0fcd28b9 100644 --- a/libnm/nm-device-bt.c +++ b/libnm/nm-device-bt.c @@ -28,7 +28,6 @@ #include "nm-utils.h" #include "nm-device-bt.h" -#include "nm-device-private.h" #include "nm-object-private.h" #include "nm-enum-types.h" @@ -65,7 +64,7 @@ nm_device_bt_get_hw_address (NMDeviceBt *device) { g_return_val_if_fail (NM_IS_DEVICE_BT (device), NULL); - return NM_DEVICE_BT_GET_PRIVATE (device)->hw_address; + return nm_str_not_empty (NM_DEVICE_BT_GET_PRIVATE (device)->hw_address); } /** @@ -178,12 +177,11 @@ get_hw_address (NMDevice *device) return nm_device_bt_get_hw_address (NM_DEVICE_BT (device)); } -/************************************************************/ +/*****************************************************************************/ static void nm_device_bt_init (NMDeviceBt *device) { - _nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_BT); } static void @@ -248,8 +246,6 @@ nm_device_bt_class_init (NMDeviceBtClass *bt_class) g_type_class_add_private (bt_class, sizeof (NMDeviceBtPrivate)); - _nm_object_class_add_interface (nm_object_class, NM_DBUS_INTERFACE_DEVICE_BLUETOOTH); - /* virtual methods */ object_class->finalize = finalize; object_class->get_property = get_property; -- cgit 1.3.0-6-gf8a5