1 files changed, 53 insertions, 36 deletions

diff --git a/src/voicecall.c b/src/voicecall.c
index 36a795d2..bb99420e 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -668,19 +668,24 @@ static DBusMessage *voicecall_answer(DBusConnection *conn,
 }
 
 static const GDBusMethodTable voicecall_methods[] = {
-	{ "GetProperties",  "",    "a{sv}",   voicecall_get_properties },
-	{ "Deflect",        "s",   "",        voicecall_deflect,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "Hangup",         "",    "",        voicecall_hangup,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "Answer",         "",    "",        voicecall_answer,
-						G_DBUS_METHOD_FLAG_ASYNC },
+	{ _GDBUS_METHOD("GetProperties", "", "a{sv}",
+				NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
+				voicecall_get_properties) },
+	{ _GDBUS_ASYNC_METHOD("Deflect", "s", "",
+					GDBUS_ARGS({ "number", "s" }), NULL,
+					voicecall_deflect) },
+	{ _GDBUS_ASYNC_METHOD("Hangup", "", "", NULL, NULL,
+							voicecall_hangup) },
+	{ _GDBUS_ASYNC_METHOD("Answer", "", "", NULL, NULL,
+							voicecall_answer) },
 	{ }
 };
 
 static const GDBusSignalTable voicecall_signals[] = {
-	{ "PropertyChanged",	"sv" },
-	{ "DisconnectReason",	"s" },
+	{ _GDBUS_SIGNAL("PropertyChanged", "sv",
+			GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
+	{ _GDBUS_SIGNAL("DisconnectReason", "s",
+					GDBUS_ARGS({ "reason", "s" })) },
 	{ }
 };
 
@@ -2118,37 +2123,49 @@ static DBusMessage *manager_get_calls(DBusConnection *conn,
 }
 
 static const GDBusMethodTable manager_methods[] = {
-	{ "GetProperties",     "",    "a{sv}",      manager_get_properties },
-	{ "Dial",              "ss",  "o",          manager_dial,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "Transfer",          "",    "",           manager_transfer,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "SwapCalls",         "",    "",           manager_swap_calls,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "ReleaseAndAnswer",  "",    "",           manager_release_and_answer,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "HoldAndAnswer",     "",    "",           manager_hold_and_answer,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "HangupAll",         "",    "",           manager_hangup_all,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "PrivateChat",       "o",   "ao",         multiparty_private_chat,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "CreateMultiparty",  "",    "ao",         multiparty_create,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "HangupMultiparty",  "",    "",           multiparty_hangup,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "SendTones",         "s",   "",           manager_tone,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "GetCalls",          "",    "a(oa{sv})",  manager_get_calls },
+	{ _GDBUS_METHOD("GetProperties", "", "a{sv}",
+				NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
+				manager_get_properties) },
+	{ _GDBUS_ASYNC_METHOD("Dial", "ss", "o",
+		GDBUS_ARGS({ "number", "s" }, { "hide_callerid", "s" }),
+		GDBUS_ARGS({ "path", "o" }),
+		manager_dial) },
+	{ _GDBUS_ASYNC_METHOD("Transfer", "", "", NULL, NULL,
+							manager_transfer) },
+	{ _GDBUS_ASYNC_METHOD("SwapCalls", "", "",  NULL, NULL,
+							manager_swap_calls) },
+	{ _GDBUS_ASYNC_METHOD("ReleaseAndAnswer", "", "", NULL, NULL,
+						manager_release_and_answer) },
+	{ _GDBUS_ASYNC_METHOD("HoldAndAnswer", "", "", NULL, NULL,
+						manager_hold_and_answer) },
+	{ _GDBUS_ASYNC_METHOD("HangupAll", "", "", NULL, NULL,
+						manager_hangup_all) },
+	{ _GDBUS_ASYNC_METHOD("PrivateChat", "o", "ao",
+						GDBUS_ARGS({ "call", "o" }),
+						GDBUS_ARGS({ "calls", "ao" }),
+						multiparty_private_chat) },
+	{ _GDBUS_ASYNC_METHOD("CreateMultiparty", "", "ao",
+					NULL, GDBUS_ARGS({ "calls", "o" }),
+					multiparty_create) },
+	{ _GDBUS_ASYNC_METHOD("HangupMultiparty", "", "", NULL, NULL,
+					multiparty_hangup) },
+	{ _GDBUS_ASYNC_METHOD("SendTones", "s", "",
+					GDBUS_ARGS({ "SendTones", "s" }), NULL,
+					manager_tone) },
+	{ _GDBUS_METHOD("GetCalls", "", "a(oa{sv})",
+		NULL, GDBUS_ARGS({ "calls_with_properties", "a(oa{sv})" }),
+		manager_get_calls) },
 	{ }
 };
 
 static const GDBusSignalTable manager_signals[] = {
-	{ "Forwarded",		"s" },
-	{ "BarringActive",	"s" },
-	{ "PropertyChanged",	"sv" },
-	{ "CallAdded",		"oa{sv}" },
-	{ "CallRemoved",	"o" },
+	{ _GDBUS_SIGNAL("Forwarded", "s", GDBUS_ARGS({ "type", "s" })) },
+	{ _GDBUS_SIGNAL("BarringActive", "s", GDBUS_ARGS({ "type", "s" })) },
+	{ _GDBUS_SIGNAL("PropertyChanged", "sv",
+			GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
+	{ _GDBUS_SIGNAL("CallAdded", "oa{sv}",
+		GDBUS_ARGS({ "path", "o" }, { "properties", "a{sv}" })) },
+	{ _GDBUS_SIGNAL("CallRemoved", "o", GDBUS_ARGS({ "path", "o"})) },
 	{ }
 };