AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

imcontext: Be more lenient in parsing Compose

Browse Source 
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.
This commit is contained in:
Matthias Clasen 2021-02-14 12:56:00 -05:00
parent 2623932886
commit d2e074e36b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkcomposetable.c
View File

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