Merge branch 'compose-warning' into 'master'

imcontext: Take out the warnings

See merge request GNOME/gtk!3230
This commit is contained in:
Matthias Clasen 2021-02-22 20:31:19 +00:00
commit 700f39bfca

View File

@ -99,9 +99,6 @@ parse_compose_value (GtkComposeData *compose_data,
while (*p && g_ascii_isspace (*p)) while (*p && g_ascii_isspace (*p))
p++; p++;
if (*p != '\0' && *p != '#')
g_warning ("Ignoring keysym after string: %s: %s", val, line);
compose_data->value = g_string_free (value, FALSE); compose_data->value = g_string_free (value, FALSE);
return TRUE; return TRUE;
} }
@ -248,10 +245,7 @@ parse_compose_line (GList **compose_list,
return; return;
if (g_str_has_prefix (line, "include ")) if (g_str_has_prefix (line, "include "))
{ return;
g_warning ("include in Compose files not supported: %s", line);
return;
}
components = g_strsplit (line, ":", 2); components = g_strsplit (line, ":", 2);