aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2012-05-18 00:23:32 -0300
committerMarcel Holtmann <marcel@holtmann.org>2012-05-17 20:32:21 -0700
commit7eebe7fb415ecc8aebc936de0971431ff0956e76 (patch)
tree8b81e891c795072cd2f41e3d21a2b40302f61b16 /plugins
parentfd9148dd2587995e53ab093756106b70c476a622 (diff)
downloadbluez-7eebe7fb415ecc8aebc936de0971431ff0956e76.tar.gz
bluez-7eebe7fb415ecc8aebc936de0971431ff0956e76.tar.xz
bluez-7eebe7fb415ecc8aebc936de0971431ff0956e76.zip
Do not set signature and reply in GDBus tables
Use GDBUS_* macros, so signature and reply fields are not set in each method/signal.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/dbusoob.c6
-rw-r--r--plugins/service.c10
2 files changed, 8 insertions, 8 deletions
diff --git a/plugins/dbusoob.c b/plugins/dbusoob.c
index 0d7a6ff3..17913428 100644
--- a/plugins/dbusoob.c
+++ b/plugins/dbusoob.c
@@ -176,14 +176,14 @@ static DBusMessage *remove_remote_data(DBusConnection *conn, DBusMessage *msg,
}
static const GDBusMethodTable oob_methods[] = {
- { _GDBUS_METHOD("AddRemoteData", "sayay", "",
+ { GDBUS_METHOD("AddRemoteData",
GDBUS_ARGS({ "address", "s" }, { "hash", "ay" },
{ "randomizer", "ay" }), NULL,
add_remote_data) },
- { _GDBUS_METHOD("RemoveRemoteData", "s", "",
+ { GDBUS_METHOD("RemoveRemoteData",
GDBUS_ARGS({ "address", "s" }), NULL,
remove_remote_data) },
- { _GDBUS_ASYNC_METHOD("ReadLocalData", "", "ayay",
+ { GDBUS_ASYNC_METHOD("ReadLocalData",
NULL, GDBUS_ARGS({ "hash", "ay" },
{ "randomizer", "ay" }),
read_local_data) },
diff --git a/plugins/service.c b/plugins/service.c
index d03ef46f..288f8496 100644
--- a/plugins/service.c
+++ b/plugins/service.c
@@ -697,20 +697,20 @@ done:
}
static const GDBusMethodTable service_methods[] = {
- { _GDBUS_METHOD("AddRecord", "s", "u",
+ { GDBUS_METHOD("AddRecord",
GDBUS_ARGS({ "record", "s" }),
GDBUS_ARGS({ "handle", "u" }),
add_service_record) },
- { _GDBUS_METHOD("UpdateRecord", "us", "",
+ { GDBUS_METHOD("UpdateRecord",
GDBUS_ARGS({ "handle", "u" }, { "record", "s" }), NULL,
update_service_record) },
- { _GDBUS_METHOD("RemoveRecord", "u", "",
+ { GDBUS_METHOD("RemoveRecord",
GDBUS_ARGS({ "handle", "u" }), NULL,
remove_service_record) },
- { _GDBUS_ASYNC_METHOD("RequestAuthorization","su", "",
+ { GDBUS_ASYNC_METHOD("RequestAuthorization",
GDBUS_ARGS({ "address", "s" }, { "handle", "u"}), NULL,
request_authorization) },
- { _GDBUS_METHOD("CancelAuthorization", "", "",
+ { GDBUS_METHOD("CancelAuthorization",
NULL, NULL, cancel_authorization) },
{ }
};