[gtk/matthiasc/for-master: 1/2] imcontext: Be more lenient in parsing Compose

[Matthias Clasen <matthiasc src gnome org>]

commit 5af728ee1b3e4c0f5c836ac54a798d1c230138e2
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Feb 14 12:56:00 2021 -0500

    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 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 == '\\')