diff options
| author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-11-29 11:19:31 -0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2012-11-29 17:38:55 +0100 |
| commit | 959d23833ff223e0cc76aef028065b6f6356e2af (patch) | |
| tree | 82fb6cafd4451a4f00025b837af1aa516e6ae089 | |
| parent | 83c275745fa35016ceaee53ab36979794507014a (diff) | |
| download | ofono-959d23833ff223e0cc76aef028065b6f6356e2af.tar.bz2 | |
gdbus: Don't register DBus.Properties with no properties
Delay registering DBus.Properties interface until the moment there are
properties on that path. This is needed for objects that currently don't
expose any property to not export the interface.
| -rw-r--r-- | gdbus/object.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gdbus/object.c b/gdbus/object.c index 3101ca6b..47116bd5 100644 --- a/gdbus/object.c +++ b/gdbus/object.c @@ -1213,9 +1213,6 @@ static struct generic_data *object_path_ref(DBusConnection *connection, manager_methods, manager_signals, NULL, data, NULL); - add_interface(data, DBUS_INTERFACE_PROPERTIES, properties_methods, - properties_signals, NULL, data, NULL); - return data; } @@ -1336,6 +1333,12 @@ gboolean g_dbus_register_interface(DBusConnection *connection, return FALSE; } + if (properties != NULL && !find_interface(data->interfaces, + DBUS_INTERFACE_PROPERTIES)) + add_interface(data, DBUS_INTERFACE_PROPERTIES, + properties_methods, properties_signals, NULL, + data, NULL); + add_interface(data, name, methods, signals, properties, user_data, destroy); |