From 1d507cb5602d940c5b609bce69e6f7e27f7bca72 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 28 Feb 2007 19:49:34 +0000 Subject: [PATCH] Make color scheme update properly when changing themes. (#402131, Benjamin 2007-02-28 Matthias Clasen * gtk/gtksettings.c: Make color scheme update properly when changing themes. (#402131, Benjamin Berg) svn path=/branches/gtk-2-10/; revision=17367 --- ChangeLog | 7 +++++++ gtk/gtksettings.c | 7 +++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 732450bf1b..c47c2c2c6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-02-28 Matthias Clasen + + Merge from trunk: + + * gtk/gtksettings.c: Make color scheme update properly + when changing themes. (#402131, Benjamin Berg) + 2007-02-28 Matthias Clasen Merge from trunk: diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 7879b96fb1..3cd341e957 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -1646,13 +1646,12 @@ add_color_to_hash (gchar *name, GdkColor *color, GHashTable *target) { - GdkColor *old, *new; + GdkColor *old; old = g_hash_table_lookup (target, name); if (!old || !gdk_color_equal (old, color)) { - new = gdk_color_copy (color); - g_hash_table_insert (target, g_strdup (name), new); + g_hash_table_insert (target, g_strdup (name), gdk_color_copy (color)); return TRUE; } @@ -1699,7 +1698,7 @@ add_colors_to_hash_from_string (GHashTable *hash, } if (gdk_color_parse (p, &color)) - changed = add_color_to_hash (name, &color, hash); + changed |= add_color_to_hash (name, &color, hash); } g_free (copy);