diff options
| author | Robert Tari <robert@tari.in> | 2025-05-14 16:22:42 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2025-05-14 16:24:22 +0200 |
| commit | 17394a6f684b46e9f4bc2ed039515b09971b39d9 (patch) | |
| tree | 1bd33b2fd78e840d878467f990b552a8c6b0f65a /src/keyboard-x11.c | |
| parent | 70a3ea2b263a3d9095a9c00b09e2b3086d3f55cc (diff) | |
| download | ayatana-indicator-keyboard-17394a6f684b46e9f4bc2ed039515b09971b39d9.tar.gz ayatana-indicator-keyboard-17394a6f684b46e9f4bc2ed039515b09971b39d9.tar.bz2 ayatana-indicator-keyboard-17394a6f684b46e9f4bc2ed039515b09971b39d9.zip | |
Fix showing current layout on Lomiri
Just like GNOME did, we are switching to tecla here, since gkbd-keyboard-display does not work under Wayland.
fixes https://github.com/AyatanaIndicators/ayatana-indicator-keyboard/issues/76
Diffstat (limited to 'src/keyboard-x11.c')
| -rw-r--r-- | src/keyboard-x11.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/keyboard-x11.c b/src/keyboard-x11.c index d7d482f5..27dfb97c 100644 --- a/src/keyboard-x11.c +++ b/src/keyboard-x11.c @@ -1,5 +1,5 @@ /* - * Copyright 2021-2024 Robert Tari <robert@tari.in> + * Copyright 2021-2025 Robert Tari <robert@tari.in> * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -390,7 +390,7 @@ guint keyboard_GetLayoutIndex (Keyboard *pKeyboard) return pKeyboard->pPrivate->nLayout; } -void keyboard_GetLayout(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gchar **pDescription) +void keyboard_GetLayout(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gchar **pDescription, gchar **pId) { if (nLayout == -1) { @@ -432,7 +432,14 @@ void keyboard_GetLayout(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gc *pDescription = g_strdup(pLayout->sDescription); } - g_free(sId); + if (pId != NULL) + { + *pId = sId; + } + else + { + g_free(sId); + } } void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout) |