Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'builder-tool-fixes' into 'main'

Browse Source 
builderparser: Be more robust

See merge request GNOME/gtk!4247
This commit is contained in:
Matthias Clasen
2021-12-13 21:29:48 +00:00
parent e230c9c6f0 66d8631c23
commit a55458a84a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/gtk-builder-tool-simplify.c
View File

@@ -432,6 +432,9 @@ value_is_default (Element *element,
if (g_type_is_a (G_PARAM_SPEC_VALUE_TYPE (pspec), G_TYPE_BOXED)) if (g_type_is_a (G_PARAM_SPEC_VALUE_TYPE (pspec), G_TYPE_BOXED))
return FALSE; return FALSE;
if (!value_string)
return FALSE;
if (!gtk_builder_value_from_string (data->builder, pspec, value_string, &value, &error)) if (!gtk_builder_value_from_string (data->builder, pspec, value_string, &value, &error))
{ {
g_printerr (_("%s:%d: Couldn’t parse value for property '%s': %s\n"), data->input_filename, element->line_number, pspec->name, error->message); g_printerr (_("%s:%d: Couldn’t parse value for property '%s': %s\n"), data->input_filename, element->line_number, pspec->name, error->message);
@@ -2301,6 +2304,12 @@ simplify_file (const char *filename,
return FALSE; return FALSE;
} }
if (data.root == NULL)
{
g_printerr (_("Can't parse “%s”\n"), filename);
return FALSE;
}
data.builder = gtk_builder_new (); data.builder = gtk_builder_new ();
if (data.convert3to4) if (data.convert3to4)