summaryrefslogtreecommitdiff
path: root/gdbus
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2012-10-06 04:02:35 -0300
committerMarcel Holtmann <marcel@holtmann.org>2012-11-26 14:44:48 +0100
commit84c89a158f93c9616e75e7d20a955e64d9e154df (patch)
treeebdb282f09ba6f659928a71de943fc8c5c29214b /gdbus
parentb001a835f425f765ba29f1fe419200f04f95645e (diff)
downloadconnman-84c89a158f93c9616e75e7d20a955e64d9e154df.tar.gz
connman-84c89a158f93c9616e75e7d20a955e64d9e154df.tar.bz2
connman-84c89a158f93c9616e75e7d20a955e64d9e154df.zip
gdbus: Fix up Properties.Set() code path
Minor fixes to make setter actually work: - Add propdata in pending_property_set - Break loop when we are removing propdata from list and we found it - in_args and out_args were swapped - interface and method name arguments were swapped
Diffstat (limited to 'gdbus')
-rw-r--r--gdbus/object.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/gdbus/object.c b/gdbus/object.c
index 444728c7..66431de7 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -433,6 +433,8 @@ static struct property_data *remove_pending_property_data(
propdata = l->data;
if (propdata->id != id)
continue;
+
+ break;
}
if (l == NULL)
@@ -844,7 +846,7 @@ static DBusMessage *properties_set(DBusConnection *connection,
"Invalid argument type: '%c'",
dbus_message_iter_get_arg_type(&iter));
- dbus_message_iter_get_basic(&iter, &name);
+ dbus_message_iter_get_basic(&iter, &interface);
dbus_message_iter_next(&iter);
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
@@ -852,7 +854,7 @@ static DBusMessage *properties_set(DBusConnection *connection,
"Invalid argument type: '%c'",
dbus_message_iter_get_arg_type(&iter));
- dbus_message_iter_get_basic(&iter, &interface);
+ dbus_message_iter_get_basic(&iter, &name);
dbus_message_iter_next(&iter);
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)
@@ -887,6 +889,7 @@ static DBusMessage *properties_set(DBusConnection *connection,
propdata = g_new(struct property_data, 1);
propdata->id = next_pending_property++;
propdata->message = dbus_message_ref(message);
+ pending_property_set = g_slist_prepend(pending_property_set, propdata);
property->set(property, &sub, propdata->id, iface->user_data);
@@ -898,9 +901,10 @@ static const GDBusMethodTable properties_methods[] = {
GDBUS_ARGS({ "interface", "s" }, { "name", "s" }),
GDBUS_ARGS({ "value", "v" }),
properties_get) },
- { GDBUS_ASYNC_METHOD("Set", NULL,
+ { GDBUS_ASYNC_METHOD("Set",
GDBUS_ARGS({ "interface", "s" }, { "name", "s" },
{ "value", "v" }),
+ NULL,
properties_set) },
{ GDBUS_METHOD("GetAll",
GDBUS_ARGS({ "interface", "s" }),