From 56311efd9d161094ae7115b37fa21b3840169f08 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sat, 7 Oct 2023 02:45:56 +0200 Subject: src/keyboard-x11.c: Define new D-Bus name and path for greeter --- src/keyboard-x11.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/keyboard-x11.c b/src/keyboard-x11.c index 2e8435ff..141a23ee 100644 --- a/src/keyboard-x11.c +++ b/src/keyboard-x11.c @@ -21,6 +21,9 @@ #include "languages.h" #include "keyboard.h" +#define GREETER_BUS_NAME "org.ayatana.greeter" +#define GREETER_BUS_PATH "/org/ayatana/greeter" + enum { LAYOUT_CHANGED, @@ -123,7 +126,7 @@ static void getAccountsService(Keyboard *pKeyboard, ActUser *pUser) if (!pKeyboard->pPrivate->sUser) { GError *pError = NULL; - GVariant *pUser = g_dbus_connection_call_sync (pKeyboard->pPrivate->pConnection, "org.ArcticaProject.ArcticaGreeter", "/org/ArcticaProject/ArcticaGreeter", "org.ArcticaProject.ArcticaGreeter", "GetUser", NULL, G_VARIANT_TYPE ("(s)"), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &pError); + GVariant *pUser = g_dbus_connection_call_sync (pKeyboard->pPrivate->pConnection, GREETER_BUS_NAME, GREETER_BUS_PATH, GREETER_BUS_NAME, "GetUser", NULL, G_VARIANT_TYPE ("(s)"), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &pError); if (pError) { @@ -440,7 +443,7 @@ void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout) GError *pError = NULL; GVariant *pLayout = g_variant_new ("(ss)", lParams[0], sVariant); - g_dbus_connection_call_sync (pKeyboard->pPrivate->pConnection, "org.ArcticaProject.ArcticaGreeter", "/org/ArcticaProject/ArcticaGreeter", "org.ArcticaProject.ArcticaGreeter", "SetLayout", pLayout, NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &pError); + g_dbus_connection_call_sync (pKeyboard->pPrivate->pConnection, GREETER_BUS_NAME, GREETER_BUS_PATH, GREETER_BUS_NAME, "SetLayout", pLayout, NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &pError); if (pError) { @@ -640,7 +643,7 @@ static void keyboard_init(Keyboard *self) else { self->pPrivate->lUsers = NULL; - self->pPrivate->nSubscription = g_dbus_connection_signal_subscribe (self->pPrivate->pConnection, NULL, "org.ArcticaProject.ArcticaGreeter", "UserChanged", "/org/ArcticaProject/ArcticaGreeter", NULL, G_DBUS_SIGNAL_FLAGS_NONE, onUserChanged, self, NULL); + self->pPrivate->nSubscription = g_dbus_connection_signal_subscribe (self->pPrivate->pConnection, NULL, GREETER_BUS_NAME, "UserChanged", GREETER_BUS_PATH, NULL, G_DBUS_SIGNAL_FLAGS_NONE, onUserChanged, self, NULL); // Get layouts from /etc/default/keyboard gchar *sFile; -- cgit v1.2.3 From 2666f465b19e276abb5eb06f7a3ed6f952df302e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 6 Oct 2023 14:41:23 +0200 Subject: d/control: Bump B-D libayatana-common-dev to (>= 0.9.9). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 6b4485c5..d7ebffcc 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: cmake, libglib2.0-dev (>= 2.36), libx11-dev (>=1.7.0), libxklavier-dev (>=5.4), - libayatana-common-dev (>= 0.9.3), + libayatana-common-dev (>= 0.9.9), libxkbcommon-dev (>=1.0.3), libxkbregistry-dev (>=1.0.3), libaccountsservice-dev, -- cgit v1.2.3 From a8867cf9c9e7afa0f71a1ab07509ffe3ce407fc8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 6 Oct 2023 14:41:51 +0200 Subject: CMakeLists.txt: Require libayatana-common >= 0.9.9. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 935db13c..7c14e2e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ add_definitions (-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" -DLOCALEDIR="${CMAKE_INS find_package (PkgConfig REQUIRED) include (CheckIncludeFile) include (FindPkgConfig) -pkg_check_modules(SERVICE_DEPS REQUIRED glib-2.0>=2.36 gio-2.0>=2.36 libayatana-common>=0.9.3 accountsservice xkbcommon>=1.0.3 xkbregistry>=1.0.3) +pkg_check_modules(SERVICE_DEPS REQUIRED glib-2.0>=2.36 gio-2.0>=2.36 libayatana-common>=0.9.9 accountsservice xkbcommon>=1.0.3 xkbregistry>=1.0.3) pkg_check_modules(X11_DEPS REQUIRED x11>=1.6.5 libxklavier>=5.3) include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS}) -- cgit v1.2.3