From 71243af72fb7ec29a06c249d87ae1a04ddd11a3e Mon Sep 17 00:00:00 2001
From: OMOJOLA JOSHUA <109356020+1awesomeJ@users.noreply.github.com>
Date: Wed, 15 Mar 2023 23:52:24 +0100
Subject: [PATCH] =?UTF-8?q?updated=20usage=20of=20SD=5FBUS=5FMETHOD=5FWITH?=
 =?UTF-8?q?=5FNAMES=20macros=20to=20SD=5FBUS=5FMETHOD=5FWIT=E2=80=A6=20(#2?=
 =?UTF-8?q?6840)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* localed: update usage of SD_BUS_METHOD_WITH_NAMES macros to SD_BUS_METHOD_WITH_ARGS
---
 src/locale/localed.c | 42 +++++++++++++++---------------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/locale/localed.c b/src/locale/localed.c
index 2f23eab92b..ec5b78a190 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -715,33 +715,21 @@ static const sd_bus_vtable locale_vtable[] = {
         SD_BUS_PROPERTY("VConsoleKeymap", "s", property_get_vconsole, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_PROPERTY("VConsoleKeymapToggle", "s", property_get_vconsole, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
 
-        SD_BUS_METHOD_WITH_NAMES("SetLocale",
-                                 "asb",
-                                 SD_BUS_PARAM(locale)
-                                 SD_BUS_PARAM(interactive),
-                                 NULL,,
-                                 method_set_locale,
-                                 SD_BUS_VTABLE_UNPRIVILEGED),
-        SD_BUS_METHOD_WITH_NAMES("SetVConsoleKeyboard",
-                                 "ssbb",
-                                 SD_BUS_PARAM(keymap)
-                                 SD_BUS_PARAM(keymap_toggle)
-                                 SD_BUS_PARAM(convert)
-                                 SD_BUS_PARAM(interactive),
-                                 NULL,,
-                                 method_set_vc_keyboard,
-                                 SD_BUS_VTABLE_UNPRIVILEGED),
-        SD_BUS_METHOD_WITH_NAMES("SetX11Keyboard",
-                                 "ssssbb",
-                                 SD_BUS_PARAM(layout)
-                                 SD_BUS_PARAM(model)
-                                 SD_BUS_PARAM(variant)
-                                 SD_BUS_PARAM(options)
-                                 SD_BUS_PARAM(convert)
-                                 SD_BUS_PARAM(interactive),
-                                 NULL,,
-                                 method_set_x11_keyboard,
-                                 SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD_WITH_ARGS("SetLocale",
+                                SD_BUS_ARGS("as", locale, "b", interactive),
+                                SD_BUS_NO_RESULT,
+                                method_set_locale,
+                                SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD_WITH_ARGS("SetVConsoleKeyboard",
+                                SD_BUS_ARGS("s", keymap, "s", keymap_toggle, "b", convert, "b", interactive),
+                                SD_BUS_NO_RESULT,
+                                method_set_vc_keyboard,
+                                SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD_WITH_ARGS("SetX11Keyboard",
+                                SD_BUS_ARGS("s", layout, "s", model, "s", variant, "s", options, "b", convert, "b", interactive),
+                                SD_BUS_NO_RESULT,
+                                method_set_x11_keyboard,
+                                SD_BUS_VTABLE_UNPRIVILEGED),
 
         SD_BUS_VTABLE_END
 };