diff options
| author | Dan Winship <danw@redhat.com> | 2015-04-13 13:31:42 -0400 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2015-07-24 13:25:47 -0400 |
| commit | 6fcc1deee0a9549d753813f9406ea1d74a2a8e8c (patch) | |
| tree | 6eda31c6115d9e42600adf531610e1a1fcb80507 /src/nm-dbus-manager.c | |
| parent | f3d10b3ec8aa6674f8146ea6d1fd9d872af50083 (diff) | |
| download | NetworkManager-6fcc1deee0a9549d753813f9406ea1d74a2a8e8c.tar.gz | |
core: add an NMExportedObject base class
Add NMExportedObject, make it the base class of all D-Bus-exported
types, and move the nm-properties-changed-signal logic into it. (Also,
make NMSettings use the same properties-changed code as everything
else, which it was not previously doing, presumably for historical
reasons).
(This is mostly just shuffling code around at this point, but
NMExportedObject will be more important in the gdbus port, since
gdbus-codegen doesn't do a very good job of supporting objects that
export multiple interfaces [as each NMDevice subclass does, for
example], so we will need more glue/helper code in NMExportedObject
then.)
Diffstat (limited to 'src/nm-dbus-manager.c')
| -rw-r--r-- | src/nm-dbus-manager.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c index 0a664b0a12..48f0084228 100644 --- a/src/nm-dbus-manager.c +++ b/src/nm-dbus-manager.c @@ -29,7 +29,6 @@ #include "nm-glib.h" #include "nm-dbus-interface.h" #include "nm-dbus-manager.h" -#include "nm-properties-changed-signal.h" #include <dbus/dbus.h> #include <dbus/dbus-glib.h> @@ -855,33 +854,6 @@ object_destroyed (NMDBusManager *self, gpointer object) } void -nm_dbus_manager_register_exported_type (NMDBusManager *self, - GType object_type, - const DBusGObjectInfo *info) -{ - const char *properties_info, *dbus_name, *gobject_name, *tmp_access; - - dbus_g_object_type_install_info (object_type, info); - if (!info->exported_properties) - return; - - properties_info = info->exported_properties; - while (*properties_info) { - /* The format is: "interface\0DBusPropertyName\0gobject_property_name\0access\0" */ - dbus_name = strchr (properties_info, '\0') + 1; - gobject_name = strchr (dbus_name, '\0') + 1; - tmp_access = strchr (gobject_name, '\0') + 1; - properties_info = strchr (tmp_access, '\0') + 1; - - /* Note that nm-properties-changed-signal takes advantage of the - * fact that @dbus_name and @gobject_name are static data that won't - * ever be freed. - */ - nm_properties_changed_signal_add_property (object_type, dbus_name, gobject_name); - } -} - -void nm_dbus_manager_register_object (NMDBusManager *self, const char *path, gpointer object) |