From c63eb830386932317033acd092a56f9b82755f4c Mon Sep 17 00:00:00 2001 From: Henrique Dante de Almeida Date: Fri, 18 May 2012 17:30:09 -0300 Subject: [PATCH] Do not set signature and reply in GDBus tables Use GDBUS_* macros, so signature and reply fields are not set in each method/signal. --- plugins/nmcompat.c | 6 +++--- src/clock.c | 6 +++--- src/manager.c | 36 ++++++++++++++++++------------------ src/service.c | 20 ++++++++++---------- src/session.c | 8 ++++---- src/technology.c | 8 ++++---- unit/session-api.c | 4 ++-- 7 files changed, 44 insertions(+), 44 deletions(-) diff --git a/plugins/nmcompat.c b/plugins/nmcompat.c index 680cdf8..400389b 100644 --- a/plugins/nmcompat.c +++ b/plugins/nmcompat.c @@ -221,16 +221,16 @@ static DBusMessage *property_get(DBusConnection *conn, } static const GDBusMethodTable methods[] = { - { _GDBUS_METHOD("Get", "ss", "v", + { GDBUS_METHOD("Get", GDBUS_ARGS({ "interface", "s" }, { "key", "s" }), GDBUS_ARGS({ "property", "v" }), property_get) }, { }, }; static const GDBusSignalTable signals[] = { - { _GDBUS_SIGNAL("PropertiesChanged", "a{sv}", + { GDBUS_SIGNAL("PropertiesChanged", GDBUS_ARGS({ "properties", "a{sv}" })) }, - { _GDBUS_SIGNAL("StateChanged", "u", + { GDBUS_SIGNAL("StateChanged", GDBUS_ARGS({ "state", "u" })) }, { }, }; diff --git a/src/clock.c b/src/clock.c index 5562e52..e2cc19f 100644 --- a/src/clock.c +++ b/src/clock.c @@ -309,17 +309,17 @@ static DBusMessage *set_property(DBusConnection *conn, } static const GDBusMethodTable clock_methods[] = { - { _GDBUS_METHOD("GetProperties", "", "a{sv}", + { GDBUS_METHOD("GetProperties", NULL, GDBUS_ARGS({ "properties", "a{sv}" }), get_properties) }, - { _GDBUS_METHOD("SetProperty", "sv", "", + { GDBUS_METHOD("SetProperty", GDBUS_ARGS({ "name", "s" }, { "value", "v" }), NULL, set_property) }, { }, }; static const GDBusSignalTable clock_signals[] = { - { _GDBUS_SIGNAL("PropertyChanged", "sv", + { GDBUS_SIGNAL("PropertyChanged", GDBUS_ARGS({ "name", "s" }, { "value", "v" })) }, { }, }; diff --git a/src/manager.c b/src/manager.c index 33b50e2..641f453 100644 --- a/src/manager.c +++ b/src/manager.c @@ -394,66 +394,66 @@ static DBusMessage *release_private_network(DBusConnection *conn, } static const GDBusMethodTable manager_methods[] = { - { _GDBUS_METHOD("GetProperties", "", "a{sv}", + { GDBUS_METHOD("GetProperties", NULL, GDBUS_ARGS({ "properties", "a{sv}" }), get_properties) }, - { _GDBUS_ASYNC_METHOD("SetProperty", "sv", "", + { GDBUS_ASYNC_METHOD("SetProperty", GDBUS_ARGS({ "properties", "a{sv}" }), NULL, set_property) }, - { _GDBUS_METHOD("GetTechnologies", "", "a(oa{sv})", + { GDBUS_METHOD("GetTechnologies", NULL, GDBUS_ARGS({ "technologies", "a(oa{sv})" }), get_technologies) }, - { _GDBUS_METHOD("RemoveProvider", "o", "", + { GDBUS_METHOD("RemoveProvider", GDBUS_ARGS({ "provider", "o" }), NULL, remove_provider) }, - { _GDBUS_METHOD("GetServices", "", "a(oa{sv})", + { GDBUS_METHOD("GetServices", NULL, GDBUS_ARGS({ "services", "a(oa{sv})" }), get_services) }, - { _GDBUS_ASYNC_METHOD("ConnectProvider", "a{sv}", "o", + { GDBUS_ASYNC_METHOD("ConnectProvider", GDBUS_ARGS({ "provider", "a{sv}" }), GDBUS_ARGS({ "path", "o" }), connect_provider) }, - { _GDBUS_METHOD("RegisterAgent", "o", "", + { GDBUS_METHOD("RegisterAgent", GDBUS_ARGS({ "path", "o" }), NULL, register_agent) }, - { _GDBUS_METHOD("UnregisterAgent", "o", "", + { GDBUS_METHOD("UnregisterAgent", GDBUS_ARGS({ "path", "o" }), NULL, unregister_agent) }, - { _GDBUS_METHOD("RegisterCounter", "ouu", "", + { GDBUS_METHOD("RegisterCounter", GDBUS_ARGS({ "path", "o" }, { "accuracy", "u" }, { "period", "u" }), NULL, register_counter) }, - { _GDBUS_METHOD("UnregisterCounter", "o", "", + { GDBUS_METHOD("UnregisterCounter", GDBUS_ARGS({ "path", "o" }), NULL, unregister_counter) }, - { _GDBUS_METHOD("CreateSession", "a{sv}o", "o", + { GDBUS_METHOD("CreateSession", GDBUS_ARGS({ "settings", "a{sv}" }, { "notifier", "o" }), GDBUS_ARGS({ "session", "o" }), create_session) }, - { _GDBUS_METHOD("DestroySession", "o", "", + { GDBUS_METHOD("DestroySession", GDBUS_ARGS({ "session", "o" }), NULL, destroy_session) }, - { _GDBUS_ASYNC_METHOD("RequestPrivateNetwork", "", "oa{sv}h", + { GDBUS_ASYNC_METHOD("RequestPrivateNetwork", NULL, GDBUS_ARGS({ "path", "o" }, { "settings", "a{sv}" }, { "socket", "h" }), request_private_network) }, - { _GDBUS_METHOD("ReleasePrivateNetwork", "o", "", + { GDBUS_METHOD("ReleasePrivateNetwork", GDBUS_ARGS({ "path", "o" }), NULL, release_private_network) }, { }, }; static const GDBusSignalTable manager_signals[] = { - { _GDBUS_SIGNAL("PropertyChanged", "sv", + { GDBUS_SIGNAL("PropertyChanged", GDBUS_ARGS({ "name", "s" }, { "value", "v" })) }, - { _GDBUS_SIGNAL("TechnologyAdded", "oa{sv}", + { GDBUS_SIGNAL("TechnologyAdded", GDBUS_ARGS({ "path", "o" }, { "properties", "a{sv}" })) }, - { _GDBUS_SIGNAL("TechnologyRemoved", "o", + { GDBUS_SIGNAL("TechnologyRemoved", GDBUS_ARGS({ "path", "o" })) }, - { _GDBUS_SIGNAL("ServicesChanged", "a(oa{sv})ao", + { GDBUS_SIGNAL("ServicesChanged", GDBUS_ARGS({ "services_changed", "a(oa{sv})" }, { "services_removed", "ao" })) }, { }, diff --git a/src/service.c b/src/service.c index 84a1124..e2f1f57 100644 --- a/src/service.c +++ b/src/service.c @@ -3812,32 +3812,32 @@ static void service_schedule_removed(struct connman_service *service) } static const GDBusMethodTable service_methods[] = { - { _GDBUS_DEPRECATED_METHOD("GetProperties", "", "a{sv}", + { GDBUS_DEPRECATED_METHOD("GetProperties", NULL, GDBUS_ARGS({ "properties", "a{sv}" }), get_properties) }, - { _GDBUS_METHOD("SetProperty", "sv", "", + { GDBUS_METHOD("SetProperty", GDBUS_ARGS({ "name", "s" }, { "value", "v" }), NULL, set_property) }, - { _GDBUS_METHOD("ClearProperty", "s", "", + { GDBUS_METHOD("ClearProperty", GDBUS_ARGS({ "name", "s" }), NULL, clear_property) }, - { _GDBUS_ASYNC_METHOD("Connect", "", "", NULL, NULL, + { GDBUS_ASYNC_METHOD("Connect", NULL, NULL, connect_service) }, - { _GDBUS_METHOD("Disconnect", "", "", NULL, NULL, + { GDBUS_METHOD("Disconnect", NULL, NULL, disconnect_service) }, - { _GDBUS_METHOD("Remove", "", "", NULL, NULL, remove_service) }, - { _GDBUS_METHOD("MoveBefore", "o", "", + { GDBUS_METHOD("Remove", NULL, NULL, remove_service) }, + { GDBUS_METHOD("MoveBefore", GDBUS_ARGS({ "service", "o" }), NULL, move_before) }, - { _GDBUS_METHOD("MoveAfter", "o", "", + { GDBUS_METHOD("MoveAfter", GDBUS_ARGS({ "service", "o" }), NULL, move_after) }, - { _GDBUS_METHOD("ResetCounters", "", "", NULL, NULL, reset_counters) }, + { GDBUS_METHOD("ResetCounters", NULL, NULL, reset_counters) }, { }, }; static const GDBusSignalTable service_signals[] = { - { _GDBUS_SIGNAL("PropertyChanged", "sv", + { GDBUS_SIGNAL("PropertyChanged", GDBUS_ARGS({ "name", "s" }, { "value", "v" })) }, { }, }; diff --git a/src/session.c b/src/session.c index c73db63..a5db7ad 100644 --- a/src/session.c +++ b/src/session.c @@ -1556,11 +1556,11 @@ static DBusMessage *destroy_session(DBusConnection *conn, } static const GDBusMethodTable session_methods[] = { - { _GDBUS_METHOD("Destroy", "", "", NULL, NULL, destroy_session) }, - { _GDBUS_METHOD("Connect", "", "", NULL, NULL, connect_session) }, - { _GDBUS_METHOD("Disconnect", "", "", NULL, NULL, + { GDBUS_METHOD("Destroy", NULL, NULL, destroy_session) }, + { GDBUS_METHOD("Connect", NULL, NULL, connect_session) }, + { GDBUS_METHOD("Disconnect", NULL, NULL, disconnect_session ) }, - { _GDBUS_METHOD("Change", "sv", "", + { GDBUS_METHOD("Change", GDBUS_ARGS({ "name", "s" }, { "value", "v" }), NULL, change_session) }, { }, diff --git a/src/technology.c b/src/technology.c index 5cb6ddb..42446b0 100644 --- a/src/technology.c +++ b/src/technology.c @@ -859,18 +859,18 @@ static DBusMessage *scan(DBusConnection *conn, DBusMessage *msg, void *data) } static const GDBusMethodTable technology_methods[] = { - { _GDBUS_DEPRECATED_METHOD("GetProperties", "", "a{sv}", + { GDBUS_DEPRECATED_METHOD("GetProperties", NULL, GDBUS_ARGS({ "properties", "a{sv}" }), get_properties) }, - { _GDBUS_METHOD("SetProperty", "sv", "", + { GDBUS_METHOD("SetProperty", GDBUS_ARGS({ "name", "s" }, { "value", "v" }), NULL, set_property) }, - { _GDBUS_ASYNC_METHOD("Scan", "", "", NULL, NULL, scan) }, + { GDBUS_ASYNC_METHOD("Scan", NULL, NULL, scan) }, { }, }; static const GDBusSignalTable technology_signals[] = { - { _GDBUS_SIGNAL("PropertyChanged", "sv", + { GDBUS_SIGNAL("PropertyChanged", GDBUS_ARGS({ "name", "s" }, { "value", "v" })) }, { }, }; diff --git a/unit/session-api.c b/unit/session-api.c index 27ca2c7..14d48cf 100644 --- a/unit/session-api.c +++ b/unit/session-api.c @@ -286,8 +286,8 @@ static DBusMessage *notify_update(DBusConnection *conn, } static const GDBusMethodTable notify_methods[] = { - { _GDBUS_METHOD("Release", "", "", NULL, NULL, notify_release) }, - { _GDBUS_METHOD("Update", "a{sv}", "", + { GDBUS_METHOD("Release", NULL, NULL, notify_release) }, + { GDBUS_METHOD("Update", GDBUS_ARGS({ "settings", "a{sv}" }), NULL, notify_update) }, { }, -- 2.7.4