From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 28 Feb 2007 19:37:08 +0000 (+0000)
Subject: Make color scheme update properly when changing themes. (#402131, Benjamin
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~34320
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c955072b67722cdeee7a7833c670f1e2e513c7ba;p=gtk4.git

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 c2d9469258..b8d870d888 100644
--- 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 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);