aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2024-05-28 10:36:40 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2024-05-28 12:37:22 +0200
commit5bb69d7643374e85b3171d7ad88278aa5a1f1dd8 (patch)
tree703418071631cb9729cd744664ba6ff004fd732c /src
parentfa22c11a102b14524da4989433be67ce35137549 (diff)
downloadayatana-indicator-keyboard-5bb69d7643374e85b3171d7ad88278aa5a1f1dd8.tar.gz
ayatana-indicator-keyboard-5bb69d7643374e85b3171d7ad88278aa5a1f1dd8.tar.bz2
ayatana-indicator-keyboard-5bb69d7643374e85b3171d7ad88278aa5a1f1dd8.zip
src/keyboard-x11.c: Add ',' and '0-9' as allowed characters to regexp for XkbVariant.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard-x11.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/keyboard-x11.c b/src/keyboard-x11.c
index aa52fbea..0c7ca55b 100644
--- a/src/keyboard-x11.c
+++ b/src/keyboard-x11.c
@@ -716,17 +716,17 @@ static void keyboard_init(Keyboard *self)
if (bDefaultLocation)
{
#if GLIB_CHECK_VERSION(2, 73, 0)
- pRegex = g_regex_new (" *XKBVARIANT *= *\"*([a-zA-Z]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
+ pRegex = g_regex_new (" *XKBVARIANT *= *\"*([,a-zA-Z0-9]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
#else
- pRegex = g_regex_new (" *XKBVARIANT *= *\"*([a-zA-Z]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
+ pRegex = g_regex_new (" *XKBVARIANT *= *\"*([,a-zA-Z0-9]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
#endif
}
else
{
#if GLIB_CHECK_VERSION(2, 73, 0)
- pRegex = g_regex_new (" *Option +\"*XkbVariant\"* +\"*([a-zA-Z]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
+ pRegex = g_regex_new (" *Option +\"*XkbVariant\"* +\"*([,a-zA-Z0-9]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
#else
- pRegex = g_regex_new (" *Option +\"*XkbVariant\"* +\"*([a-zA-Z]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
+ pRegex = g_regex_new (" *Option +\"*XkbVariant\"* +\"*([,a-zA-Z0-9]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
#endif
}