42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
|
From d11cde0c1cd01b6db59605fef95b746620011e08 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matthias Clasen <mclasen@redhat.com>
|
||
|
|
Date: Sun, 14 Feb 2021 12:56:00 -0500
|
||
|
|
Subject: [PATCH 2/3] imcontext: Be more lenient in parsing Compose
|
||
|
|
|
||
|
|
X11 allows keysyms to be specified in addition to strings.
|
||
|
|
We only support the strings. In the past, we ignored everything
|
||
|
|
after the string. Go back to doing that, but issue a warning
|
||
|
|
that we've ignored the keysym.
|
||
|
|
---
|
||
|
|
gtk/gtkcomposetable.c | 7 ++-----
|
||
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/gtk/gtkcomposetable.c b/gtk/gtkcomposetable.c
|
||
|
|
index f8657d2660..6d88665f8b 100644
|
||
|
|
--- a/gtk/gtkcomposetable.c
|
||
|
|
+++ b/gtk/gtkcomposetable.c
|
||
|
|
@@ -84,7 +84,7 @@ parse_compose_value (GtkComposeData *compose_data,
|
||
|
|
|
||
|
|
if (val[0] != '"')
|
||
|
|
{
|
||
|
|
- g_warning ("Need to double-quote the value: %s: %s", val, line);
|
||
|
|
+ g_warning ("Only strings supported after ':': %s: %s", val, line);
|
||
|
|
goto fail;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -104,10 +104,7 @@ parse_compose_value (GtkComposeData *compose_data,
|
||
|
|
while (*p && g_ascii_isspace (*p))
|
||
|
|
p++;
|
||
|
|
if (*p != '\0' && *p != '#')
|
||
|
|
- {
|
||
|
|
- g_warning ("Garbage after closing '\"': %s: %s", val, line);
|
||
|
|
- goto fail;
|
||
|
|
- }
|
||
|
|
+ g_warning ("Ignoring keysym after string: %s: %s", val, line);
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
else if (*p == '\\')
|
||
|
|
--
|
||
|
|
2.29.2
|
||
|
|
|