From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 14 Feb 2021 17:56:00 +0000 (-0500)
Subject: imcontext: Be more lenient in parsing Compose
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1~1^2~83^2^2~401^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d2e074e36b5c3c8def215dbbf56f2507b36f561f;p=gtk4.git

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.
---

diff --git a/gtk/gtkcomposetable.c b/gtk/gtkcomposetable.c
index 20afc2dc44..3c60cc1886 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 == '\\')