diff options
| author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-05-18 16:59:55 -0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2012-05-18 15:04:59 -0700 |
| commit | 4efd19fce5b56b20763c13f412c137d93a10e770 (patch) | |
| tree | a67117e554890fed17de144bfd0eca317b532a8e | |
| parent | f95c56d930ec72e8a0c35fd9815f41b65a70664e (diff) | |
| download | mmsd-4efd19fce5b56b20763c13f412c137d93a10e770.tar.gz | |
Do not set signature and reply in GDBus tables
Use GDBUS_* macros, so signature and reply fields are not set in each
method/signal.
| -rw-r--r-- | plugins/ofono.c | 4 | ||||
| -rw-r--r-- | src/service.c | 25 |
2 files changed, 13 insertions, 16 deletions
diff --git a/plugins/ofono.c b/plugins/ofono.c index fcdb228..45fac91 100644 --- a/plugins/ofono.c +++ b/plugins/ofono.c @@ -115,11 +115,11 @@ static DBusMessage *agent_release(DBusConnection *conn, } static const GDBusMethodTable agent_methods[] = { - { _GDBUS_METHOD("ReceiveNotification", "aya{sv}", "", + { GDBUS_METHOD("ReceiveNotification", GDBUS_ARGS({ "notification", "ay" }, { "info", "a{sv}" }), NULL, agent_receive) }, - { _GDBUS_NOREPLY_METHOD("Release", "", "", NULL, NULL, agent_release) }, + { GDBUS_NOREPLY_METHOD("Release", NULL, NULL, agent_release) }, { } }; diff --git a/src/service.c b/src/service.c index 669d10e..83e1fe1 100644 --- a/src/service.c +++ b/src/service.c @@ -223,13 +223,13 @@ static DBusMessage *msg_mark_read(DBusConnection *conn, } static const GDBusMethodTable message_methods[] = { - { _GDBUS_METHOD("MarkRead", "", "", NULL, NULL, msg_mark_read) }, - { _GDBUS_METHOD("Delete", "", "", NULL, NULL, msg_delete) }, + { GDBUS_METHOD("MarkRead", NULL, NULL, msg_mark_read) }, + { GDBUS_METHOD("Delete", NULL, NULL, msg_delete) }, { } }; static const GDBusSignalTable message_signals[] = { - { _GDBUS_SIGNAL("PropertyChanged", "sv", + { GDBUS_SIGNAL("PropertyChanged", GDBUS_ARGS({ "name", "s" }, { "value", "v" })) }, { } }; @@ -981,16 +981,16 @@ release_msg: } static const GDBusMethodTable service_methods[] = { - { _GDBUS_METHOD("SendMessage", "assa(sss)", "o", + { GDBUS_METHOD("SendMessage", GDBUS_ARGS({ "recipients", "as" }, { "smil", "s" }, { "attachments", "a(sss)" }), GDBUS_ARGS({ "path", "o" }), send_message) }, - { _GDBUS_METHOD("GetMessages", "", "a(oa{sv})", + { GDBUS_METHOD("GetMessages", NULL, GDBUS_ARGS({ "messages_with_properties", "a(oa{sv})" }), get_messages) }, - { _GDBUS_METHOD("GetConversation", "su", "a(oa{sv})", + { GDBUS_METHOD("GetConversation", GDBUS_ARGS({ "number", "s" }, { "count", "s" }), GDBUS_ARGS({ "messages_with_properties", "a(oa{sv}" }), get_conversation) }, @@ -998,10 +998,9 @@ static const GDBusMethodTable service_methods[] = { }; static const GDBusSignalTable service_signals[] = { - { _GDBUS_SIGNAL("MessageAdded", "oa{sv}", - GDBUS_ARGS({ "path", "o" }, + { GDBUS_SIGNAL("MessageAdded", GDBUS_ARGS({ "path", "o" }, { "properties", "a{sv}" })) }, - { _GDBUS_SIGNAL("MessageRemoved", "o", GDBUS_ARGS({ "path", "o" })) }, + { GDBUS_SIGNAL("MessageRemoved", GDBUS_ARGS({ "path", "o" })) }, { } }; @@ -2356,18 +2355,16 @@ static DBusMessage *get_services(DBusConnection *conn, } static const GDBusMethodTable manager_methods[] = { - { _GDBUS_METHOD("GetServices", "", "a(oa{sv})", - NULL, + { GDBUS_METHOD("GetServices", NULL, GDBUS_ARGS({ "services_with_properties", "a(oa{sv})" }), get_services) }, { } }; static const GDBusSignalTable manager_signals[] = { - { _GDBUS_SIGNAL("ServiceAdded", "oa{sv}", - GDBUS_ARGS({ "path", "o" }, + { GDBUS_SIGNAL("ServiceAdded", GDBUS_ARGS({ "path", "o" }, { "properties", "a{sv}" })) }, - { _GDBUS_SIGNAL("ServiceRemoved", "o", GDBUS_ARGS({ "path", "o" })) }, + { GDBUS_SIGNAL("ServiceRemoved", GDBUS_ARGS({ "path", "o" })) }, { } }; |