summaryrefslogtreecommitdiff
path: root/gtk/gtksettings.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2007-02-28 19:37:08 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-02-28 19:37:08 +0000
commitc955072b67722cdeee7a7833c670f1e2e513c7ba (patch)
treecfa243b4f9173be9de27cc3f04e94370ac543688 /gtk/gtksettings.c
parent2b029759c744974607d971dc6b39a5f62d6f8ba6 (diff)
downloadgtk+-c955072b67722cdeee7a7833c670f1e2e513c7ba.tar.gz
Make color scheme update properly when changing themes. (#402131, Benjamin
2007-02-28 Matthias Clasen <mclasen@redhat.com> * gtk/gtksettings.c: Make color scheme update properly when changing themes. (#402131, Benjamin Berg) svn path=/trunk/; revision=17366
Diffstat (limited to 'gtk/gtksettings.c')
-rw-r--r--gtk/gtksettings.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 8fdb459861..c5eaadd19a 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -1926,13 +1926,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;
}
@@ -1979,7 +1978,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);