mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-25 05:01:09 +00:00
Bug 712536 - Themes with gap_(start|end)_file but no actual file crash
Code factorization in commit34fd123
reintroduced bug fixed in0d396ab
with non-equivalent factorized tests.
This commit is contained in:
parent
f765bb8803
commit
4e4c248077
@ -765,17 +765,14 @@ theme_parse_image(GtkSettings *settings,
|
||||
if (data->overlay && !data->overlay->filename)
|
||||
clear_theme_pixbuf_and_warn (&data->overlay, scanner, "Overlay image options specified without filename");
|
||||
|
||||
if (!data->gap->filename)
|
||||
{
|
||||
if (data->gap)
|
||||
clear_theme_pixbuf_and_warn (&data->gap, scanner, "Gap image options specified without filename");
|
||||
if (data->gap && !data->gap->filename)
|
||||
clear_theme_pixbuf_and_warn (&data->gap, scanner, "Gap image options specified without filename");
|
||||
|
||||
if (data->gap_start)
|
||||
clear_theme_pixbuf_and_warn (&data->gap_start, scanner, "Gap start image options specified without filename");
|
||||
if (data->gap_start && !data->gap_start->filename)
|
||||
clear_theme_pixbuf_and_warn (&data->gap_start, scanner, "Gap start image options specified without filename");
|
||||
|
||||
if (data->gap_end)
|
||||
clear_theme_pixbuf_and_warn (&data->gap_end, scanner, "Gap end image options specified without filename");
|
||||
}
|
||||
if (data->gap_end && !data->gap_end->filename)
|
||||
clear_theme_pixbuf_and_warn (&data->gap_end, scanner, "Gap end image options specified without filename");
|
||||
|
||||
if (token != G_TOKEN_RIGHT_CURLY)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user