Move a call

diff --git a/ChangeLog b/ChangeLog
index 48f792e54765ce0bad78b6baa6d5d2b5adf7f9da..654ceb3cfe1c2d37fe4eb96e288d040bea2a063d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtksettings.c (gtk_settings_finalize): Move the
+       _gtk_rc_context_destroy call to the right spot.  (#348096,
+       Chris Wilson)
+
 2006-07-24  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/gdkevents-quartz.c (gdk_screen_get_setting): Implement

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 48f792e54765ce0bad78b6baa6d5d2b5adf7f9da..654ceb3cfe1c2d37fe4eb96e288d040bea2a063d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-07-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtksettings.c (gtk_settings_finalize): Move the
+       _gtk_rc_context_destroy call to the right spot.  (#348096,
+       Chris Wilson)
+
 2006-07-24  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/gdkevents-quartz.c (gdk_screen_get_setting): Implement

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 80e3102f118730a44475fbc1f483f188adc2759a..ad93c671e5f707bd1f0530dfed8f6f4140a26e41 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -520,11 +520,11 @@ gtk_settings_finalize (GObject *object)
 
   object_list = g_slist_remove (object_list, settings);
 
+  _gtk_rc_context_destroy (settings);
+
   for (i = 0; i < class_n_properties; i++)
     g_value_unset (&settings->property_values[i].value);
   g_free (settings->property_values);
-
-  _gtk_rc_context_destroy (settings);
   
   g_datalist_clear (&settings->queued_settings);