diff options
Diffstat (limited to 'libnm/nm-device-dummy.c')
| -rw-r--r-- | libnm/nm-device-dummy.c | 71 |
1 files changed, 5 insertions, 66 deletions
diff --git a/libnm/nm-device-dummy.c b/libnm/nm-device-dummy.c index 4916cc7d..3bf8e09f 100644 --- a/libnm/nm-device-dummy.c +++ b/libnm/nm-device-dummy.c @@ -13,17 +13,8 @@ /*****************************************************************************/ -NM_GOBJECT_PROPERTIES_DEFINE_BASE ( - PROP_HW_ADDRESS, -); - -typedef struct { - char *hw_address; -} NMDeviceDummyPrivate; - struct _NMDeviceDummy { NMDevice parent; - NMDeviceDummyPrivate _priv; }; struct _NMDeviceDummyClass { @@ -46,13 +37,15 @@ G_DEFINE_TYPE (NMDeviceDummy, nm_device_dummy, NM_TYPE_DEVICE) * device, and must not be modified. * * Since: 1.10 + * + * Deprecated: 1.24: Use nm_device_get_hw_address() instead. **/ const char * nm_device_dummy_get_hw_address (NMDeviceDummy *device) { g_return_val_if_fail (NM_IS_DEVICE_DUMMY (device), NULL); - return _nml_coerce_property_str_not_empty (NM_DEVICE_DUMMY_GET_PRIVATE (device)->hw_address); + return nm_device_get_hw_address (NM_DEVICE (device)); } static gboolean @@ -85,12 +78,6 @@ get_setting_type (NMDevice *device) return NM_TYPE_SETTING_DUMMY; } -static const char * -get_hw_address (NMDevice *device) -{ - return nm_device_dummy_get_hw_address (NM_DEVICE_DUMMY (device)); -} - /*****************************************************************************/ static void @@ -98,68 +85,20 @@ nm_device_dummy_init (NMDeviceDummy *device) { } -static void -finalize (GObject *object) -{ - NMDeviceDummyPrivate *priv = NM_DEVICE_DUMMY_GET_PRIVATE (object); - - g_free (priv->hw_address); - - G_OBJECT_CLASS (nm_device_dummy_parent_class)->finalize (object); -} - -static void -get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - NMDeviceDummy *device = NM_DEVICE_DUMMY (object); - - switch (prop_id) { - case PROP_HW_ADDRESS: - g_value_set_string (value, nm_device_dummy_get_hw_address (device)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_dummy = NML_DBUS_META_IFACE_INIT_PROP ( +const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_dummy = NML_DBUS_META_IFACE_INIT ( NM_DBUS_INTERFACE_DEVICE_DUMMY, nm_device_dummy_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, NMDeviceDummy, _priv.hw_address ), + NML_DBUS_META_PROPERTY_INIT_FCN ("HwAddress", 0, "s", _nm_device_notify_update_prop_hw_address ), ), ); static void nm_device_dummy_class_init (NMDeviceDummyClass *dummy_class) { - GObjectClass *object_class = G_OBJECT_CLASS (dummy_class); NMDeviceClass *device_class = NM_DEVICE_CLASS (dummy_class); - object_class->get_property = get_property; - object_class->finalize = finalize; - device_class->connection_compatible = connection_compatible; - device_class->get_hw_address = get_hw_address; device_class->get_setting_type = get_setting_type; - - /** - * NMDeviceDummy:hw-address: - * - * The active hardware (MAC) address of the device. - * - * Since: 1.10 - **/ - obj_properties[PROP_HW_ADDRESS] = - g_param_spec_string (NM_DEVICE_DUMMY_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_dummy); } |