From 710285104b35b0be5423ab5328a1e2dba04b5502 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 20 Mar 2016 13:42:18 +0100 Subject: [PATCH] styleproperties: Really don't use 'i' in inner loop I apparently was too tired when doing 8cebc125da7e3f9c49a6d4e0ea5320c11b7c21af and forgot to replace one instance of 'i' with 'j'. Thanks Timm for finding that one. --- gtk/deprecated/gtkstyleproperties.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/deprecated/gtkstyleproperties.c b/gtk/deprecated/gtkstyleproperties.c index e65115018a..30aac876a7 100644 --- a/gtk/deprecated/gtkstyleproperties.c +++ b/gtk/deprecated/gtkstyleproperties.c @@ -932,7 +932,7 @@ gtk_style_properties_merge (GtkStyleProperties *props, array = g_value_get_boxed (_gtk_css_typed_value_get (value->value)); array_to_merge = g_value_get_boxed (_gtk_css_typed_value_get (data->value)); - for (i = 0; j < array_to_merge->len; j++) + for (j = 0; j < array_to_merge->len; j++) g_ptr_array_add (array, g_ptr_array_index (array_to_merge, j)); } else if (replace || value->value == NULL)