aboutsummaryrefslogtreecommitdiffstats
path: root/sap
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 /sap
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 'sap')
-rw-r--r--sap/sap-dummy.c8
-rw-r--r--sap/server.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/sap/sap-dummy.c b/sap/sap-dummy.c
index b2739186..e2032cf7 100644
--- a/sap/sap-dummy.c
+++ b/sap/sap-dummy.c
@@ -316,15 +316,15 @@ static DBusMessage *card_status(DBusConnection *conn, DBusMessage *msg,
}
static const GDBusMethodTable dummy_methods[] = {
- { _GDBUS_METHOD("OngoingCall", "b", "",
+ { GDBUS_METHOD("OngoingCall",
GDBUS_ARGS({ "ongoing", "b" }), NULL,
ongoing_call) },
- { _GDBUS_METHOD("MaxMessageSize", "u", "",
+ { GDBUS_METHOD("MaxMessageSize",
GDBUS_ARGS({ "size", "u" }), NULL,
max_msg_size) },
- { _GDBUS_METHOD("DisconnectImmediate", "", "", NULL, NULL,
+ { GDBUS_METHOD("DisconnectImmediate", NULL, NULL,
disconnect_immediate) },
- { _GDBUS_METHOD("CardStatus", "u", "",
+ { GDBUS_METHOD("CardStatus",
GDBUS_ARGS({ "status", "" }), NULL,
card_status) },
{ }
diff --git a/sap/server.c b/sap/server.c
index 342cd645..e44fa08a 100644
--- a/sap/server.c
+++ b/sap/server.c
@@ -1304,15 +1304,15 @@ static DBusMessage *get_properties(DBusConnection *c,
}
static const GDBusMethodTable server_methods[] = {
- { _GDBUS_METHOD("GetProperties", "", "a{sv}",
+ { GDBUS_METHOD("GetProperties",
NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
get_properties) },
- { _GDBUS_METHOD("Disconnect", "", "", NULL, NULL, disconnect) },
+ { GDBUS_METHOD("Disconnect", NULL, NULL, disconnect) },
{ }
};
static const GDBusSignalTable server_signals[] = {
- { _GDBUS_SIGNAL("PropertyChanged", "sv",
+ { GDBUS_SIGNAL("PropertyChanged",
GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
{ }
};