AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 06:00:22 +00:00
Code Issues Projects Releases Wiki Activity

builder-tool: Fix a thinko

Browse Source 
We can't rely on the pspec for a removed property.
This code worked until I actually removed the properties.

Update the tests to reflect this.
This commit is contained in:
Matthias Clasen 2020-02-26 09:59:14 -05:00
parent 5430c80361
commit fa75d7f480
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -733,7 +733,8 @@ maybe_rename_property (Element *element, MyParserData *data)
int i, k, l;
PropKind kind;
int prop_name_index = 0;
GParamSpec *pspec;
GType type;
char *canonical_name;
kind = get_prop_kind (element);
@ -751,15 +752,16 @@ maybe_rename_property (Element *element, MyParserData *data)
if (property_name == NULL)
return;
type = g_type_from_name (class_name);
pspec = get_property_pspec (data, class_name, property_name, kind);
if (pspec == NULL)
return;
canonical_name = g_strdup (property_name);
g_strdelimit (canonical_name, "_", '-');
for (k = 0; k < G_N_ELEMENTS (props); k++)
{
if (pspec->owner_type == props[k].type &&
strcmp (pspec->name, props[k].property) == 0 &&
if (g_type_is_a (type, props[k].type) &&
strcmp (canonical_name, props[k].property) == 0 &&
kind == props[k].kind)
{
g_free (element->attribute_values[prop_name_index]);
@ -787,6 +789,8 @@ maybe_rename_property (Element *element, MyParserData *data)
break;
}
}
g_free (canonical_name);
}
static Element *

3
testsuite/tools/simplify-data-3to4/grid.expected
View File

@ -9,7 +9,8 @@
<property name="active">1</property>
<property name="can_focus">1</property>
<property name="receives_default">1</property>
<property name="expand">True</property>
<property name="vexpand">1</property>
<property name="hexpand">1</property>
<property name="margin-top">10</property>
<property name="margin-right">10</property>
<property name="margin-bottom">10</property>