Convert GDBus methods to use macro helpers

With these macro helpers we can separate in/out arguments and use their
own vector.

1 files changed, 8 insertions, 5 deletions

diff --git a/src/ctm.c b/src/ctm.c
index 88ff1415..fd7df5e8 100644
--- a/src/ctm.c
+++ b/src/ctm.c
@@ -203,15 +203,18 @@ static DBusMessage *ctm_set_property(DBusConnection *conn, DBusMessage *msg,
 }
 
 static const GDBusMethodTable ctm_methods[] = {
-	{ "GetProperties",  "",    "a{sv}",  ctm_get_properties,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "SetProperty",    "sv",  "",       ctm_set_property,
-						G_DBUS_METHOD_FLAG_ASYNC },
+	{ _GDBUS_ASYNC_METHOD("GetProperties", "", "a{sv}",
+			      NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
+			      ctm_get_properties) },
+	{ _GDBUS_ASYNC_METHOD("SetProperty", "sv", "",
+		      GDBUS_ARGS({ "property", "s" }, { "value", "v" }), NULL,
+		      ctm_set_property) },
 	{ }
 };
 
 static const GDBusSignalTable ctm_signals[] = {
-	{ "PropertyChanged",	"sv" },
+	{ _GDBUS_SIGNAL("PropertyChanged", "a{sv}",
+			GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
 	{ }
 };