dundee: Watch for signals only on DUNDEE_SERVICE
[framework/connectivity/connman.git] / src / manager.c
index 33b50e2..1bf9189 100644 (file)
@@ -394,68 +394,68 @@ 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_ARGS({ "properties", "a{sv}" }), NULL,
-                       set_property) },
-       { _GDBUS_METHOD("GetTechnologies", "", "a(oa{sv})",
+       { GDBUS_ASYNC_METHOD("SetProperty",
+                       GDBUS_ARGS({ "name", "s" }, { "value", "v" }),
+                       NULL, set_property) },
+       { 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_ARGS({ "services_changed", "a(oa{sv})" },
-                                       { "services_removed", "ao" })) },
+       { GDBUS_SIGNAL("ServicesChanged",
+                       GDBUS_ARGS({ "changed", "a(oa{sv})" },
+                                       { "removed", "ao" })) },
        { },
 };