summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-02-14 20:35:40 +0000
committerMatthias Clasen <mclasen@redhat.com>2021-02-14 20:35:40 +0000
commit5f13ee0afe062133bfa1fffd38bdcb0104cb4404 (patch)
tree1aa6f036d7b202fb686bbe5776a3ab2d570f90a5
parent052b7d0ca79f75cd1e9c9d6f5d7eb0a75a0a43ff (diff)
parentd11cde0c1cd01b6db59605fef95b746620011e08 (diff)
downloadgtk+-5f13ee0afe062133bfa1fffd38bdcb0104cb4404.tar.gz
Merge branch 'lenient-compose-parsing-3' into 'gtk-3-24'
Lenient compose parsing 3 See merge request GNOME/gtk!3202
-rw-r--r--gtk/gtkcomposetable.c7
1 files 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 == '\\')