1 files changed, 25 insertions, 3 deletions

diff --git a/gtk/gtkcsslookup.c b/gtk/gtkcsslookup.c
index 11f15e837f..d621604957 100644
--- a/gtk/gtkcsslookup.c
+++ b/gtk/gtkcsslookup.c
@@ -24,6 +24,16 @@
 #include "gtkprivatetypebuiltins.h"
 #include "gtkprivate.h"
 
+static void
+free_value (gpointer data)
+{
+  GtkCssLookupValue *value = data;
+
+  gtk_css_value_unref (value->value);
+  if (value->section)
+    gtk_css_section_unref (value->section);
+}
+
 GtkCssLookup *
 gtk_css_lookup_new (void)
 {
@@ -39,6 +49,8 @@ static void
 gtk_css_lookup_free (GtkCssLookup *lookup)
 {
   _gtk_bitmask_free (lookup->set_values);
+  if (lookup->values)
+    g_array_unref (lookup->values);
   g_free (lookup);
 }
 
@@ -93,11 +105,21 @@ gtk_css_lookup_set (GtkCssLookup  *lookup,
                     GtkCssSection *section,
                     GtkCssValue   *value)
 {
+  GtkCssLookupValue v;
+
   gtk_internal_return_if_fail (lookup != NULL);
   gtk_internal_return_if_fail (value != NULL);
-  gtk_internal_return_if_fail (lookup->values[id].value == NULL);
 
-  lookup->values[id].value = value;
-  lookup->values[id].section = section;
+  v.value = gtk_css_value_ref (value);
+  v.section = section ? gtk_css_section_ref (section) : NULL;
+  v.id = id;
+
+  if (!lookup->values)
+    {
+      lookup->values = g_array_sized_new (FALSE, FALSE, sizeof (GtkCssLookupValue), 16);
+      g_array_set_clear_func (lookup->values, free_value);
+    }
+
+  g_array_append_val (lookup->values, v);
   lookup->set_values = _gtk_bitmask_set (lookup->set_values, id, TRUE);
 }