From e0d6f9f0cece363fe7397e683eb5ec5d01096f51 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Sun, 20 May 2012 02:07:32 -0300 Subject: Do not set signature and reply in GDBus tables Use GDBUS_* macros, so signature and reply fields are not set in each method/signal. --- src/cbs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/cbs.c') diff --git a/src/cbs.c b/src/cbs.c index 23c9497f..b5f0b729 100644 --- a/src/cbs.c +++ b/src/cbs.c @@ -541,21 +541,21 @@ static DBusMessage *cbs_set_property(DBusConnection *conn, DBusMessage *msg, } static const GDBusMethodTable cbs_methods[] = { - { _GDBUS_METHOD("GetProperties", "", "a{sv}", + { GDBUS_METHOD("GetProperties", NULL, GDBUS_ARGS({ "properties", "a{sv}" }), cbs_get_properties) }, - { _GDBUS_ASYNC_METHOD("SetProperty", "sv", "", - GDBUS_ARGS({ "property", "s" }, { "value", "v" }), - NULL, cbs_set_property) }, + { GDBUS_ASYNC_METHOD("SetProperty", + GDBUS_ARGS({ "property", "s" }, { "value", "v" }), + NULL, cbs_set_property) }, { } }; static const GDBusSignalTable cbs_signals[] = { - { _GDBUS_SIGNAL("PropertyChanged", "sv", + { GDBUS_SIGNAL("PropertyChanged", GDBUS_ARGS({ "property", "s" }, { "value", "v" })) }, - { _GDBUS_SIGNAL("IncomingBroadcast", "sq", + { GDBUS_SIGNAL("IncomingBroadcast", GDBUS_ARGS({ "message", "s" }, { "channel", "q" })) }, - { _GDBUS_SIGNAL("EmergencyBroadcast", "sa{sv}", + { GDBUS_SIGNAL("EmergencyBroadcast", GDBUS_ARGS({ "message", "s" }, { "dict", "a{sv}" })) }, { } }; -- cgit v1.2.3