New upstream version 1.22.0 upstream/1.22.0

1 files changed, 46 insertions, 68 deletions

diff --git a/libnm/nm-device-6lowpan.c b/libnm/nm-device-6lowpan.c
index 9a305d26..5899df30 100644
--- a/libnm/nm-device-6lowpan.c
+++ b/libnm/nm-device-6lowpan.c
@@ -1,54 +1,40 @@
+// SPDX-License-Identifier: LGPL-2.1+
 /*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- * Copyright 2018 Red Hat, Inc.
+ * Copyright (C) 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
 
 #include "nm-device-6lowpan.h"
+
 #include "nm-object-private.h"
 
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_PARENT,
+	PROP_HW_ADDRESS,
+);
+
 typedef struct {
-	NMDevice *parent;
+	NMLDBusPropertyO parent;
 	char *hw_address;
 } NMDevice6LowpanPrivate;
 
-/**
- * NMDevice6Lowpan:
- */
 struct _NMDevice6Lowpan {
-        NMDevice parent;
+	NMDevice parent;
+	NMDevice6LowpanPrivate _priv;
 };
 
-typedef struct {
-        NMDeviceClass parent;
-
-        /*< private >*/
-        gpointer padding[4];
-} NMDevice6LowpanClass;
+struct _NMDevice6LowpanClass {
+	NMDeviceClass parent;
+};
 
 G_DEFINE_TYPE (NMDevice6Lowpan, nm_device_6lowpan, NM_TYPE_DEVICE)
 
-#define NM_DEVICE_6LOWPAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_6LOWPAN, NMDevice6LowpanPrivate))
+#define NM_DEVICE_6LOWPAN_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDevice6Lowpan, NM_IS_DEVICE_6LOWPAN, NMObject, NMDevice)
 
-NM_GOBJECT_PROPERTIES_DEFINE_BASE (
-	PROP_PARENT,
-	PROP_HW_ADDRESS,
-);
+/*****************************************************************************/
 
 /**
  * nm_device_6lowpan_get_parent:
@@ -63,7 +49,7 @@ nm_device_6lowpan_get_parent (NMDevice6Lowpan *device)
 {
 	g_return_val_if_fail (NM_IS_DEVICE_6LOWPAN (device), NULL);
 
-	return NM_DEVICE_6LOWPAN_GET_PRIVATE (device)->parent;
+	return nml_dbus_property_o_get_obj (&NM_DEVICE_6LOWPAN_GET_PRIVATE (device)->parent);
 }
 
 /**
@@ -91,7 +77,7 @@ get_hw_address (NMDevice *device)
 	return nm_device_6lowpan_get_hw_address (NM_DEVICE_6LOWPAN (device));
 }
 
-/***********************************************************/
+/*****************************************************************************/
 
 static void
 nm_device_6lowpan_init (NMDevice6Lowpan *device)
@@ -99,31 +85,13 @@ nm_device_6lowpan_init (NMDevice6Lowpan *device)
 }
 
 static void
-init_dbus (NMObject *object)
+dispose (GObject *object)
 {
 	NMDevice6LowpanPrivate *priv = NM_DEVICE_6LOWPAN_GET_PRIVATE (object);
-	const NMPropertiesInfo property_info[] = {
-		{ NM_DEVICE_6LOWPAN_PARENT,         &priv->parent, NULL, NM_TYPE_DEVICE },
-		{ NM_DEVICE_6LOWPAN_HW_ADDRESS,     &priv->hw_address },
-		{ NULL },
-	};
 
-	NM_OBJECT_CLASS (nm_device_6lowpan_parent_class)->init_dbus (object);
+	G_OBJECT_CLASS (nm_device_6lowpan_parent_class)->dispose (object);
 
-	_nm_object_register_properties (object,
-	                                NM_DBUS_INTERFACE_DEVICE_6LOWPAN,
-	                                property_info);
-}
-
-static void
-finalize (GObject *object)
-{
-	NMDevice6LowpanPrivate *priv = NM_DEVICE_6LOWPAN_GET_PRIVATE (object);
-
-	g_free (priv->hw_address);
-	g_clear_object (&priv->parent);
-
-	G_OBJECT_CLASS (nm_device_6lowpan_parent_class)->finalize (object);
+	nm_clear_g_free (&priv->hw_address);
 }
 
 static void
@@ -147,6 +115,16 @@ get_property (GObject *object,
 	}
 }
 
+const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_lowpan = NML_DBUS_META_IFACE_INIT_PROP (
+	NM_DBUS_INTERFACE_DEVICE_6LOWPAN,
+	nm_device_6lowpan_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, NMDevice6Lowpan, _priv.hw_address                    ),
+		NML_DBUS_META_PROPERTY_INIT_O_PROP ("Parent",    PROP_PARENT,     NMDevice6Lowpan, _priv.parent,    nm_device_get_type ),
+	),
+);
+
 static void
 nm_device_6lowpan_class_init (NMDevice6LowpanClass *klass)
 {
@@ -154,12 +132,12 @@ nm_device_6lowpan_class_init (NMDevice6LowpanClass *klass)
 	NMObjectClass *nm_object_class = NM_OBJECT_CLASS (klass);
 	NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
 
-	g_type_class_add_private (klass, sizeof (NMDevice6LowpanPrivate));
-
-	object_class->finalize = finalize;
 	object_class->get_property = get_property;
+	object_class->dispose      = dispose;
+
+	_NM_OBJECT_CLASS_INIT_PRIV_PTR_DIRECT (nm_object_class, NMDevice6Lowpan);
 
-	nm_object_class->init_dbus = init_dbus;
+	_NM_OBJECT_CLASS_INIT_PROPERTY_O_FIELDS_1 (nm_object_class, NMDevice6LowpanPrivate, parent);
 
 	device_class->get_hw_address = get_hw_address;
 
@@ -171,10 +149,10 @@ nm_device_6lowpan_class_init (NMDevice6LowpanClass *klass)
 	 * Since: 1.14
 	 **/
 	obj_properties[PROP_PARENT] =
-		g_param_spec_object (NM_DEVICE_6LOWPAN_PARENT, "", "",
-		                     NM_TYPE_DEVICE,
-		                     G_PARAM_READABLE |
-		                     G_PARAM_STATIC_STRINGS);
+	    g_param_spec_object (NM_DEVICE_6LOWPAN_PARENT, "", "",
+	                         NM_TYPE_DEVICE,
+	                         G_PARAM_READABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMDevice6Lowpan:hw-address:
@@ -184,10 +162,10 @@ nm_device_6lowpan_class_init (NMDevice6LowpanClass *klass)
 	 * Since: 1.14
 	 **/
 	obj_properties[PROP_HW_ADDRESS] =
-		g_param_spec_string (NM_DEVICE_6LOWPAN_HW_ADDRESS, "", "",
-		                     NULL,
-		                     G_PARAM_READABLE |
-		                     G_PARAM_STATIC_STRINGS);
+	    g_param_spec_string (NM_DEVICE_6LOWPAN_HW_ADDRESS, "", "",
+	                         NULL,
+	                         G_PARAM_READABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
-	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+	_nml_dbus_meta_class_init_with_properties (object_class, &_nml_dbus_meta_iface_nm_device_lowpan);
 }