builder: Fix parsing of mixed declarationsfix-builder-parsing

The GtkBuilder parser constructs the object e.g.
when handling a <binding> element. There may be
more <property> elements after it, which we were
just not applying. Fix that by always applying
property when we see </object>. To do that, we
need to track the applied status per property.

Test included.

Fixes: #4208

1 files changed, 14 insertions, 2 deletions

diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index a151ec78cf..47af4df1fe 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -540,6 +540,9 @@ gtk_builder_get_parameters (GtkBuilder         *builder,
       const char *property_name = prop->pspec->name;
       GValue property_value = G_VALUE_INIT;
 
+      if (prop->applied)
+        continue;
+
       if (prop->value)
         {
           g_value_init (&property_value, G_PARAM_SPEC_VALUE_TYPE (prop->pspec));
@@ -582,6 +585,9 @@ gtk_builder_get_parameters (GtkBuilder         *builder,
                   continue;
                 }
               /* Delay setting property */
+
+              prop->applied = TRUE;
+
               property = g_slice_new (DelayedProperty);
               property->pspec = prop->pspec;
               property->object = g_strdup (object_name);
@@ -612,9 +618,15 @@ gtk_builder_get_parameters (GtkBuilder         *builder,
       g_assert (G_IS_VALUE (&property_value));
 
       if ((prop->pspec->flags & filter_flags) != 0 && filtered_parameters)
-        object_properties_add (filtered_parameters, property_name, &property_value);
+        {
+          object_properties_add (filtered_parameters, property_name, &property_value);
+          prop->applied = TRUE;
+        }
       else if ((prop->pspec->flags & filter_flags) == 0 && parameters)
-        object_properties_add (parameters, property_name, &property_value);
+        {
+          object_properties_add (parameters, property_name, &property_value);
+          prop->applied = TRUE;
+        }
       else
         g_value_unset (&property_value);
     }