summaryrefslogtreecommitdiff
path: root/gdbus/object.c
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2012-10-04 04:26:35 -0300
committerMarcel Holtmann <marcel@holtmann.org>2012-11-26 14:44:48 +0100
commit1a5030195cfc4ef5dee3fb99913a2f5b4ed6d21d (patch)
tree9086e8cc8e7ca02353dd120a498ebc8da1d98c6f /gdbus/object.c
parent6c077951862a042a1407db7de55762a2d86e4251 (diff)
downloadconnman-1a5030195cfc4ef5dee3fb99913a2f5b4ed6d21d.tar.gz
connman-1a5030195cfc4ef5dee3fb99913a2f5b4ed6d21d.tar.bz2
connman-1a5030195cfc4ef5dee3fb99913a2f5b4ed6d21d.zip
gdbus: Integrates ObjectManager with Properties interface
This appends the properties and its values when using ObjectManager.
Diffstat (limited to 'gdbus/object.c')
-rw-r--r--gdbus/object.c28
1 files changed, 27 insertions, 1 deletions
diff --git a/gdbus/object.c b/gdbus/object.c
index 7ce3aaf0..30c1a5b7 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -496,10 +496,28 @@ static void reset_parent(gpointer data, gpointer user_data)
child->parent = parent;
}
+static void append_property(struct interface_data *iface,
+ const GDBusPropertyTable *p, DBusMessageIter *dict)
+{
+ DBusMessageIter entry, value;
+
+ dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY, NULL,
+ &entry);
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &p->name);
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, p->type,
+ &value);
+
+ p->get(p, &value, iface->user_data);
+
+ dbus_message_iter_close_container(&entry, &value);
+ dbus_message_iter_close_container(dict, &entry);
+}
+
static void append_properties(struct interface_data *data,
DBusMessageIter *iter)
{
DBusMessageIter dict;
+ const GDBusPropertyTable *p;
dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY,
DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
@@ -507,7 +525,15 @@ static void append_properties(struct interface_data *data,
DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
- /* TODO: list properties */
+ for (p = data->properties; p && p->name; p++) {
+ if (p->get == NULL)
+ continue;
+
+ if (p->exists != NULL && !p->exists(p, data->user_data))
+ continue;
+
+ append_property(data, p, &dict);
+ }
dbus_message_iter_close_container(iter, &dict);
}