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/call-barring.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'src/call-barring.c') diff --git a/src/call-barring.c b/src/call-barring.c index af78564c..ddf4c738 100644 --- a/src/call-barring.c +++ b/src/call-barring.c @@ -967,30 +967,29 @@ static DBusMessage *cb_set_passwd(DBusConnection *conn, DBusMessage *msg, } static const GDBusMethodTable cb_methods[] = { - { _GDBUS_ASYNC_METHOD("GetProperties", "", "a{sv}", - NULL, GDBUS_ARGS({ "properties", "a{sv}" }), - cb_get_properties) }, - { _GDBUS_ASYNC_METHOD("SetProperty", "svs", "", - GDBUS_ARGS({ "property", "s" }, + { GDBUS_ASYNC_METHOD("GetProperties", + NULL, GDBUS_ARGS({ "properties", "a{sv}" }), + cb_get_properties) }, + { GDBUS_ASYNC_METHOD("SetProperty", + GDBUS_ARGS({ "property", "s" }, { "value", "v" }, { "pin2", "s" }), - NULL, cb_set_property) }, - { _GDBUS_ASYNC_METHOD("DisableAll", "s", "", - GDBUS_ARGS({ "password", "s" }), NULL, - cb_disable_ab) }, - { _GDBUS_ASYNC_METHOD("DisableAllIncoming", "s", "", - GDBUS_ARGS({ "password", "s" }), NULL, - cb_disable_ac) }, - { _GDBUS_ASYNC_METHOD("DisableAllOutgoing", "s", "", - GDBUS_ARGS({ "password", "s" }), NULL, - cb_disable_ag) }, - { _GDBUS_ASYNC_METHOD("ChangePassword", "ss", "", - GDBUS_ARGS({ "old", "s" }, { "new", "s" }), - NULL, cb_set_passwd) }, + NULL, cb_set_property) }, + { GDBUS_ASYNC_METHOD("DisableAll", GDBUS_ARGS({ "password", "s" }), + NULL, cb_disable_ab) }, + { GDBUS_ASYNC_METHOD("DisableAllIncoming", + GDBUS_ARGS({ "password", "s" }), NULL, + cb_disable_ac) }, + { GDBUS_ASYNC_METHOD("DisableAllOutgoing", + GDBUS_ARGS({ "password", "s" }), NULL, + cb_disable_ag) }, + { GDBUS_ASYNC_METHOD("ChangePassword", + GDBUS_ARGS({ "old", "s" }, { "new", "s" }), + NULL, cb_set_passwd) }, { } }; static const GDBusSignalTable cb_signals[] = { - { _GDBUS_SIGNAL("PropertyChanged", "sv", + { GDBUS_SIGNAL("PropertyChanged", GDBUS_ARGS({ "name", "s" }, { "value", "v" })) }, { } }; -- cgit v1.2.3