diff options
author | Henrique Dante de Almeida <hdante@profusion.mobi> | 2012-05-18 17:30:09 -0300 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2012-05-18 15:02:37 -0700 |
commit | c63eb830386932317033acd092a56f9b82755f4c (patch) | |
tree | 7777421f8117b0812ec7f8628e1cbfda8286bea8 /src | |
parent | 9d8544b0a8d45524f3bee1287a98731f1ca289e4 (diff) | |
download | connman-c63eb830386932317033acd092a56f9b82755f4c.tar.gz connman-c63eb830386932317033acd092a56f9b82755f4c.tar.bz2 connman-c63eb830386932317033acd092a56f9b82755f4c.zip |
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')
-rw-r--r-- | src/clock.c | 6 | ||||
-rw-r--r-- | src/manager.c | 36 | ||||
-rw-r--r-- | src/service.c | 20 | ||||
-rw-r--r-- | src/session.c | 8 | ||||
-rw-r--r-- | src/technology.c | 8 |
5 files changed, 39 insertions, 39 deletions
diff --git a/src/clock.c b/src/clock.c index 5562e525..e2cc19fa 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 33b50e2a..641f4531 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 84a1124a..e2f1f576 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 c73db63c..a5db7ad9 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 5cb6ddb8..42446b0b 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" })) }, { }, }; |