From d9c4801d94b8b8f76ade17de40309cd7fc5eda8e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 27 Jul 2006 14:13:18 +0000 Subject: [PATCH] Move a call --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gtk/gtksettings.c | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48f792e547..654ceb3cfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-07-27 Matthias Clasen + + * 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 * gdk/quartz/gdkevents-quartz.c (gdk_screen_get_setting): Implement diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 48f792e547..654ceb3cfe 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2006-07-27 Matthias Clasen + + * 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 * gdk/quartz/gdkevents-quartz.c (gdk_screen_get_setting): Implement diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 80e3102f11..ad93c671e5 100644 --- 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);