Merge branch 'master' into toolpalette

[~andy/gtk] / gtk / gtksettings.c

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 96ee7f28aa1812dacd45b38627e49a840b66f634..649348b4a4da2655c5484f649319a84815e77e6e 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -2306,8 +2306,8 @@ update_color_hash (ColorSchemeData   *data,
   gint i;
   GHashTable *old_hash;
   GHashTableIter iter;
-  gchar *name;
-  GdkColor *color;
+  gpointer name;
+  gpointer color;
 
   if ((str == NULL || *str == '\0') &&
       (data->lastentry[source] == NULL || data->lastentry[source][0] == '\0'))