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

diff --git a/ChangeLog b/ChangeLog
index c2d94692588e2efbf0105e63e5243e49ad28042e..b8d870d8880b0e2cf5699bd4d330e0ef0fc1714f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-28  Matthias Clasen <mclasen@redhat.com>
+
+       * gtk/gtksettings.c: Make color scheme update properly
+       when changing themes.  (#402131, Benjamin Berg)
+
 2007-02-28  Matthias Clasen <mclasen@redhat.com>
 
        * gtk/gtkrc.c: Don't leak references to the color-hash 

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 8fdb4598612f9a2a45eeba19feeba032ad7bc4aa..c5eaadd19a90bc6b3b9501cd4bc1ef38d1cb5b07 100644 (file)
--- 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);