Merge branch 'compose-warning-3' into 'gtk-3-24'
imcontext: Take out the warnings See merge request GNOME/gtk!3231
This commit is contained in:
@ -100,11 +100,6 @@ parse_compose_value (GtkComposeData *compose_data,
|
|||||||
}
|
}
|
||||||
else if (*p == '\"')
|
else if (*p == '\"')
|
||||||
{
|
{
|
||||||
p++;
|
|
||||||
while (*p && g_ascii_isspace (*p))
|
|
||||||
p++;
|
|
||||||
if (*p != '\0' && *p != '#')
|
|
||||||
g_warning ("Ignoring keysym after string: %s: %s", val, line);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if (*p == '\\')
|
else if (*p == '\\')
|
||||||
@ -246,10 +241,7 @@ parse_compose_line (GList **compose_list,
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
if (g_str_has_prefix (line, "include "))
|
if (g_str_has_prefix (line, "include "))
|
||||||
{
|
|
||||||
g_warning ("include in Compose files not supported: %s", line);
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
components = g_strsplit (line, ":", 2);
|
components = g_strsplit (line, ":", 2);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user