diff options
| author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-05-20 02:07:29 -0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2012-05-20 02:47:57 -0700 |
| commit | b3489f2ee86c1d7ace388b43420a32f9a76b019c (patch) | |
| tree | 90688955099f3fe63186caa79d9d7bcbb2f82770 /src/call-barring.c | |
| parent | 8e815c100b566e1de1f5e555e0291f6610a08cd7 (diff) | |
| download | ofono-b3489f2ee86c1d7ace388b43420a32f9a76b019c.tar.bz2 | |
Convert GDBus methods to use macro helpers
With these macro helpers we can separate in/out arguments and use their
own vector.
Diffstat (limited to 'src/call-barring.c')
| -rw-r--r-- | src/call-barring.c | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/src/call-barring.c b/src/call-barring.c index 6b9bf6ef..af78564c 100644 --- a/src/call-barring.c +++ b/src/call-barring.c @@ -967,23 +967,31 @@ static DBusMessage *cb_set_passwd(DBusConnection *conn, DBusMessage *msg, } static const GDBusMethodTable cb_methods[] = { - { "GetProperties", "", "a{sv}", cb_get_properties, - G_DBUS_METHOD_FLAG_ASYNC }, - { "SetProperty", "svs", "", cb_set_property, - G_DBUS_METHOD_FLAG_ASYNC }, - { "DisableAll", "s", "", cb_disable_ab, - G_DBUS_METHOD_FLAG_ASYNC }, - { "DisableAllIncoming", "s", "", cb_disable_ac, - G_DBUS_METHOD_FLAG_ASYNC }, - { "DisableAllOutgoing", "s", "", cb_disable_ag, - G_DBUS_METHOD_FLAG_ASYNC }, - { "ChangePassword", "ss", "", cb_set_passwd, - G_DBUS_METHOD_FLAG_ASYNC }, + { _GDBUS_ASYNC_METHOD("GetProperties", "", "a{sv}", + NULL, GDBUS_ARGS({ "properties", "a{sv}" }), + cb_get_properties) }, + { _GDBUS_ASYNC_METHOD("SetProperty", "svs", "", + 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) }, { } }; static const GDBusSignalTable cb_signals[] = { - { "PropertyChanged", "sv" }, + { _GDBUS_SIGNAL("PropertyChanged", "sv", + GDBUS_ARGS({ "name", "s" }, { "value", "v" })) }, { } }; |