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

diff --git a/ChangeLog b/ChangeLog
index dfcb9c2571250823cc4c2f71c914108bf578c988..1b137a0be4a874ab5e7445caa4e15fa9d4009638 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index adf3c925ec6dac228868ff38c5392e53a9ae105a..80bd4029543dc28d23c5a0e5fca0a3464561b1f1 100644 (file)
--- 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);
 }