New upstream version 1.5.90 upstream/1.5.90

1 files changed, 3 insertions, 7 deletions

diff --git a/libnm/nm-device-tun.c b/libnm/nm-device-tun.c
index b227f5b1..2c88bf33 100644
--- a/libnm/nm-device-tun.c
+++ b/libnm/nm-device-tun.c
@@ -28,7 +28,6 @@
 #include "nm-utils.h"
 
 #include "nm-device-tun.h"
-#include "nm-device-private.h"
 #include "nm-object-private.h"
 
 G_DEFINE_TYPE (NMDeviceTun, nm_device_tun, NM_TYPE_DEVICE)
@@ -74,7 +73,7 @@ nm_device_tun_get_hw_address (NMDeviceTun *device)
 {
 	g_return_val_if_fail (NM_IS_DEVICE_TUN (device), NULL);
 
-	return NM_DEVICE_TUN_GET_PRIVATE (device)->hw_address;
+	return nm_str_not_empty (NM_DEVICE_TUN_GET_PRIVATE (device)->hw_address);
 }
 
 /**
@@ -92,7 +91,7 @@ nm_device_tun_get_mode (NMDeviceTun *device)
 {
 	g_return_val_if_fail (NM_IS_DEVICE_TUN (device), NULL);
 
-	return NM_DEVICE_TUN_GET_PRIVATE (device)->mode;
+	return nm_str_not_empty (NM_DEVICE_TUN_GET_PRIVATE (device)->mode);
 }
 
 /**
@@ -234,12 +233,11 @@ get_hw_address (NMDevice *device)
 	return nm_device_tun_get_hw_address (NM_DEVICE_TUN (device));
 }
 
-/***********************************************************/
+/*****************************************************************************/
 
 static void
 nm_device_tun_init (NMDeviceTun *device)
 {
-	_nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_TUN);
 }
 
 static void
@@ -320,8 +318,6 @@ nm_device_tun_class_init (NMDeviceTunClass *gre_class)
 
 	g_type_class_add_private (gre_class, sizeof (NMDeviceTunPrivate));
 
-	_nm_object_class_add_interface (nm_object_class, NM_DBUS_INTERFACE_DEVICE_TUN);
-
 	/* virtual methods */
 	object_class->finalize = finalize;
 	object_class->get_property = get_property;