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 20afc2dc446e7f5b0744d273acaa0a51602d8b3d..3c60cc1886445cc1f23886d1311fd7feb15e9bd9 100644 (file)
--- 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 == '\\')