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

builder-tool: Fix property check

Browse Source 
Embarrassingly, there was a missing else
causing us to check all packing properties
as object properties, never finding them.
This commit is contained in:
Matthias Clasen 2019-04-23 21:25:59 +00:00
parent 65ff19d149
commit 28be1c5d3a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -500,7 +500,7 @@ property_can_be_omitted (Element *element,
if (g_str_equal (element->parent->element_name, "packing"))
kind = PROP_KIND_PACKING;
if (g_str_equal (element->parent->element_name, "cell-packing"))
else if (g_str_equal (element->parent->element_name, "cell-packing"))
kind = PROP_KIND_CELL_PACKING;
else
kind = PROP_KIND_OBJECT;
@ -522,7 +522,8 @@ property_can_be_omitted (Element *element,
property_name = (const gchar *)element->attribute_values[i];
}
if (keep_for_rewrite (class_name, property_name, kind))
if (data->convert3to4 &&
keep_for_rewrite (class_name, property_name, kind))
return FALSE; /* keep, will be rewritten */
if (translatable)