diff options
| author | Dan Winship <danw@gnome.org> | 2013-05-07 12:18:41 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2013-05-20 16:38:33 -0300 |
| commit | 5a223b908954a67aef0c77ca29a251560eaace60 (patch) | |
| tree | 698e97637f73aab6bfb7689ad044068f56052add /src/devices/nm-device-generic.c | |
| parent | 04cb58eacd1df9c25f0411b8c4062b0f9edcde0f (diff) | |
core: make nm-properties-changed-signal always export the right properties
Change the way that nm-properties-changed-signal works, and parse the
dbus-binding-tool-generated info to get the exact list of properties
that it's expected to export.
This makes NM_PROPERTY_PARAM_NO_EXPORT unnecessary, and also fixes the
problem of properties like NMDevice:hw-address being exported on
classes where it shouldn't be.
Diffstat (limited to 'src/devices/nm-device-generic.c')
| -rw-r--r-- | src/devices/nm-device-generic.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/devices/nm-device-generic.c b/src/devices/nm-device-generic.c index 7a04efe98f..6aa19ac48e 100644 --- a/src/devices/nm-device-generic.c +++ b/src/devices/nm-device-generic.c @@ -24,9 +24,9 @@ #include "nm-device-private.h" #include "nm-enum-types.h" #include "nm-platform.h" -#include "nm-properties-changed-signal.h" #include "nm-utils.h" #include "nm-glib-compat.h" +#include "nm-dbus-manager.h" #include "nm-device-generic-glue.h" @@ -39,14 +39,6 @@ typedef struct { } NMDeviceGenericPrivate; enum { - PROPERTIES_CHANGED, - - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = { 0 }; - -enum { PROP_0, PROP_TYPE_DESCRIPTION, @@ -217,13 +209,9 @@ nm_device_generic_class_init (NMDeviceGenericClass *klass) NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - /* signals */ - signals[PROPERTIES_CHANGED] = - nm_properties_changed_signal_new (object_class, - G_STRUCT_OFFSET (NMDeviceGenericClass, properties_changed)); - - dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass), - &dbus_glib_nm_device_generic_object_info); + nm_dbus_manager_register_exported_type (nm_dbus_manager_get (), + G_TYPE_FROM_CLASS (klass), + &dbus_glib_nm_device_generic_object_info); dbus_g_error_domain_register (NM_DEVICE_GENERIC_ERROR, NULL, NM_TYPE_DEVICE_GENERIC_ERROR); } |