From f01351d17e86b5a9be142ab62f2cd76cb098bbaf Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 28 Feb 2007 17:16:27 +0000 Subject: [PATCH] Don't leak references to the color-hash gotten from GtkSettings. (#409357, 2007-02-28 Matthias Clasen * gtk/gtkrc.c: Don't leak references to the color-hash gotten from GtkSettings. (#409357, Benjamin Berg) svn path=/branches/gtk-2-10/; revision=17365 --- ChangeLog | 7 +++++++ gtk/gtkrc.c | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ff9efac47..732450bf1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-02-28 Matthias Clasen + + Merge from trunk: + + * gtk/gtkrc.c: Don't leak references to the color-hash + gotten from GtkSettings. (#409357, Benjamin Berg) + 2007-02-26 Matthias Clasen Merge from trunk: diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 96106c1266..08378a3124 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -661,9 +661,6 @@ gtk_rc_color_hash_changed (GtkSettings *settings, g_object_get (settings, "color-hash", &context->color_hash, NULL); - if (context->color_hash) - g_hash_table_ref (context->color_hash); - if (!context->reloading) gtk_rc_reparse_all_for_settings (settings, TRUE); } @@ -690,9 +687,6 @@ gtk_rc_context_get (GtkSettings *settings) "color-hash", &context->color_hash, NULL); - if (context->color_hash) - g_hash_table_ref (context->color_hash); - g_signal_connect (settings, "notify::gtk-theme-name", G_CALLBACK (gtk_rc_settings_changed),