Do not set signature and reply in GDBus tables

Use GDBUS_* macros, so signature and reply fields are not set in each
method/signal.

1 files changed, 29 insertions, 35 deletions

diff --git a/src/voicecall.c b/src/voicecall.c
index bb99420e..dd4a2f95 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -668,23 +668,20 @@ static DBusMessage *voicecall_answer(DBusConnection *conn,
 }
 
 static const GDBusMethodTable voicecall_methods[] = {
-	{ _GDBUS_METHOD("GetProperties", "", "a{sv}",
+	{ GDBUS_METHOD("GetProperties",
 				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) },
+	{ GDBUS_ASYNC_METHOD("Deflect", 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[] = {
-	{ _GDBUS_SIGNAL("PropertyChanged", "sv",
+	{ GDBUS_SIGNAL("PropertyChanged",
 			GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
-	{ _GDBUS_SIGNAL("DisconnectReason", "s",
+	{ GDBUS_SIGNAL("DisconnectReason",
 					GDBUS_ARGS({ "reason", "s" })) },
 	{ }
 };
@@ -2123,49 +2120,46 @@ static DBusMessage *manager_get_calls(DBusConnection *conn,
 }
 
 static const GDBusMethodTable manager_methods[] = {
-	{ _GDBUS_METHOD("GetProperties", "", "a{sv}",
-				NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
-				manager_get_properties) },
-	{ _GDBUS_ASYNC_METHOD("Dial", "ss", "o",
+	{ GDBUS_METHOD("GetProperties",
+			NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
+			manager_get_properties) },
+	{ GDBUS_ASYNC_METHOD("Dial",
 		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,
+	{ 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,
+	{ GDBUS_ASYNC_METHOD("HoldAndAnswer", NULL, NULL,
 						manager_hold_and_answer) },
-	{ _GDBUS_ASYNC_METHOD("HangupAll", "", "", NULL, NULL,
+	{ GDBUS_ASYNC_METHOD("HangupAll", NULL, NULL,
 						manager_hangup_all) },
-	{ _GDBUS_ASYNC_METHOD("PrivateChat", "o", "ao",
-						GDBUS_ARGS({ "call", "o" }),
+	{ GDBUS_ASYNC_METHOD("PrivateChat", GDBUS_ARGS({ "call", "o" }),
 						GDBUS_ARGS({ "calls", "ao" }),
 						multiparty_private_chat) },
-	{ _GDBUS_ASYNC_METHOD("CreateMultiparty", "", "ao",
+	{ GDBUS_ASYNC_METHOD("CreateMultiparty",
 					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})",
+	{ GDBUS_ASYNC_METHOD("HangupMultiparty", NULL, NULL,
+							multiparty_hangup) },
+	{ GDBUS_ASYNC_METHOD("SendTones",
+				GDBUS_ARGS({ "SendTones", "s" }), NULL,
+				manager_tone) },
+	{ GDBUS_METHOD("GetCalls",
 		NULL, GDBUS_ARGS({ "calls_with_properties", "a(oa{sv})" }),
 		manager_get_calls) },
 	{ }
 };
 
 static const GDBusSignalTable manager_signals[] = {
-	{ _GDBUS_SIGNAL("Forwarded", "s", GDBUS_ARGS({ "type", "s" })) },
-	{ _GDBUS_SIGNAL("BarringActive", "s", GDBUS_ARGS({ "type", "s" })) },
-	{ _GDBUS_SIGNAL("PropertyChanged", "sv",
+	{ GDBUS_SIGNAL("Forwarded", GDBUS_ARGS({ "type", "s" })) },
+	{ GDBUS_SIGNAL("BarringActive", GDBUS_ARGS({ "type", "s" })) },
+	{ GDBUS_SIGNAL("PropertyChanged",
 			GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
-	{ _GDBUS_SIGNAL("CallAdded", "oa{sv}",
+	{ GDBUS_SIGNAL("CallAdded",
 		GDBUS_ARGS({ "path", "o" }, { "properties", "a{sv}" })) },
-	{ _GDBUS_SIGNAL("CallRemoved", "o", GDBUS_ARGS({ "path", "o"})) },
+	{ GDBUS_SIGNAL("CallRemoved", GDBUS_ARGS({ "path", "o"})) },
 	{ }
 };