New upstream version 1.23.90 upstream/1.23.90

1 files changed, 5 insertions, 64 deletions

diff --git a/libnm/nm-device-wpan.c b/libnm/nm-device-wpan.c
index 5ddd8af3..9cbf4ae0 100644
--- a/libnm/nm-device-wpan.c
+++ b/libnm/nm-device-wpan.c
@@ -13,17 +13,8 @@
 
 /*****************************************************************************/
 
-NM_GOBJECT_PROPERTIES_DEFINE_BASE (
-	PROP_HW_ADDRESS,
-);
-
-typedef struct {
-	char *hw_address;
-} NMDeviceWpanPrivate;
-
 struct _NMDeviceWpan {
 	NMDevice parent;
-	NMDeviceWpanPrivate _priv;
 };
 
 struct _NMDeviceWpanClass {
@@ -31,9 +22,6 @@ struct _NMDeviceWpanClass {
 };
 
 G_DEFINE_TYPE (NMDeviceWpan, nm_device_wpan, NM_TYPE_DEVICE)
-
-#define NM_DEVICE_WPAN_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDeviceWpan, NM_IS_DEVICE_WPAN, NMObject, NMDevice)
-
 /*****************************************************************************/
 
 /**
@@ -44,13 +32,15 @@ G_DEFINE_TYPE (NMDeviceWpan, nm_device_wpan, NM_TYPE_DEVICE)
  *
  * Returns: the active hardware address. This is the internal string used by the
  * device, and must not be modified.
+ *
+ * Deprecated: 1.24: Use nm_device_get_hw_address() instead.
  **/
 const char *
 nm_device_wpan_get_hw_address (NMDeviceWpan *device)
 {
 	g_return_val_if_fail (NM_IS_DEVICE_WPAN (device), NULL);
 
-	return _nml_coerce_property_str_not_empty (NM_DEVICE_WPAN_GET_PRIVATE (device)->hw_address);
+	return nm_device_get_hw_address (NM_DEVICE (device));
 }
 
 static gboolean
@@ -74,27 +64,6 @@ get_setting_type (NMDevice *device)
 	return NM_TYPE_SETTING_WPAN;
 }
 
-static const char *
-get_hw_address (NMDevice *device)
-{
-	return nm_device_wpan_get_hw_address (NM_DEVICE_WPAN (device));
-}
-
-/*****************************************************************************/
-
-static void
-get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	switch (prop_id) {
-	case PROP_HW_ADDRESS:
-		g_value_set_string (value, nm_device_wpan_get_hw_address (NM_DEVICE_WPAN (object)));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
 /*****************************************************************************/
 
 static void
@@ -102,48 +71,20 @@ nm_device_wpan_init (NMDeviceWpan *device)
 {
 }
 
-static void
-finalize (GObject *object)
-{
-	NMDeviceWpanPrivate *priv = NM_DEVICE_WPAN_GET_PRIVATE (object);
-
-	g_free (priv->hw_address);
-
-	G_OBJECT_CLASS (nm_device_wpan_parent_class)->finalize (object);
-}
-
-const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_wpan = NML_DBUS_META_IFACE_INIT_PROP (
+const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_wpan = NML_DBUS_META_IFACE_INIT (
 	NM_DBUS_INTERFACE_DEVICE_WPAN,
 	nm_device_wpan_get_type,
 	NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
 	NML_DBUS_META_IFACE_DBUS_PROPERTIES (
-		NML_DBUS_META_PROPERTY_INIT_S ("HwAddress", PROP_HW_ADDRESS, NMDeviceWpan, _priv.hw_address ),
+		NML_DBUS_META_PROPERTY_INIT_FCN ("HwAddress", 0, "s", _nm_device_notify_update_prop_hw_address ),
 	),
 );
 
 static void
 nm_device_wpan_class_init (NMDeviceWpanClass *wpan_class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (wpan_class);
 	NMDeviceClass *device_class = NM_DEVICE_CLASS (wpan_class);
 
-	object_class->get_property = get_property;
-	object_class->finalize     = finalize;
-
 	device_class->connection_compatible = connection_compatible;
 	device_class->get_setting_type      = get_setting_type;
-	device_class->get_hw_address        = get_hw_address;
-
-	/**
-	 * NMDeviceWpan:hw-address:
-	 *
-	 * The active hardware (MAC) address of the device.
-	 **/
-	obj_properties[PROP_HW_ADDRESS] =
-	    g_param_spec_string (NM_DEVICE_WPAN_HW_ADDRESS, "", "",
-	                         NULL,
-	                         G_PARAM_READABLE |
-	                         G_PARAM_STATIC_STRINGS);
-
-	_nml_dbus_meta_class_init_with_properties (object_class, &_nml_dbus_meta_iface_nm_device_wpan);
 }