summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2008-12-13 04:39:38 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-12-13 04:39:38 +0000
commit2e22288e7564bc7332130b200b6f7273dd9db92a (patch)
treea5441c3ef13bd7c3d5e680157283b6b66a175eed
parent66745a993d2d017954e2cde30e92c806b6cde449 (diff)
downloadgtk+-2e22288e7564bc7332130b200b6f7273dd9db92a.tar.gz
Handle being called early. Bug report by Andrés G. Aragoneses
* gtk/gtkrc.c (gtk_rc_parse_default_files): Handle being called early. Bug report by Andrés G. Aragoneses svn path=/trunk/; revision=21875
-rw-r--r--ChangeLog7
-rw-r--r--gtk/gtkrc.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index dfcb9c2571..1b137a0be4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-12-12 Matthias Clasen <mclasen@redhat.com>
+ Bug 564066 – Crash in gtk_rc_parse_default_files
+
+ * gtk/gtkrc.c (gtk_rc_parse_default_files): Handle being called
+ early. Bug report by Andrés G. Aragoneses
+
+2008-12-12 Matthias Clasen <mclasen@redhat.com>
+
* gtk/gtkmountoperation.c: Set an empty title on password dialogs.
Pointed out by Máirín Duffy.
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index adf3c925ec..80bd402954 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -837,6 +837,8 @@ gtk_rc_parse_default_files (GtkRcContext *context)
{
gint i;
+ gtk_rc_add_initial_default_files ();
+
for (i = 0; gtk_rc_default_files[i] != NULL; i++)
gtk_rc_context_parse_file (context, gtk_rc_default_files[i], GTK_PATH_PRIO_RC, FALSE);
}