diff options
author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-05-20 02:07:32 -0300 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2012-05-20 02:47:57 -0700 |
commit | e0d6f9f0cece363fe7397e683eb5ec5d01096f51 (patch) | |
tree | d888ec6696d3e7de2ab9f91b65d7eddd93d86222 /src/call-barring.c | |
parent | ce3345e21d96b94999ff1bb1eb613f6eed5b1327 (diff) | |
download | ofono-e0d6f9f0cece363fe7397e683eb5ec5d01096f51.tar.bz2 |
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 'src/call-barring.c')
-rw-r--r-- | src/call-barring.c | 37 |
1 files changed, 18 insertions, 19 deletions
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" })) }, { } }; |