From 71021b0efd654886a164519e2e7404ecf15a3500 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 16 Apr 2007 17:13:17 +0000 Subject: [PATCH] Merged from trunk: 2007-04-16 Dan Williams Merged from trunk: * gtk/gtkrc.c: (gtk_rc_context_get): Initialise variable (#423064) svn path=/branches/gtk-2-10/; revision=17605 --- ChangeLog | 6 ++++++ gtk/gtkrc.c | 1 + 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6e8ccda6df..e2ed66d87e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-04-16 Dan Williams + + Merged from trunk: + + * gtk/gtkrc.c: (gtk_rc_context_get): Initialise variable (#423064) + 2007-04-16 Alexander Larsson Merged from trunk: diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 66e9af4c4b..f18d376d1c 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -678,6 +678,7 @@ gtk_rc_context_get (GtkSettings *settings) context->rc_sets_class = NULL; context->rc_files = NULL; context->default_style = NULL; + context->reloading = FALSE; g_object_get (settings, "gtk-theme-name", &context->theme_name,