Only set gc->colormap if it isn't already set. (Alex Larsson, #90632)

Fri Sep  6 15:35:01 2002  Owen Taylor  <otaylor@redhat.com>
        * gdk/gdkgc.c (gdk_gc_new_with_values): Only set
        gc->colormap if it isn't already set. (Alex Larsson,
        #90632)

ChangeLog

+Fri Sep  6 15:35:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkgc.c (gdk_gc_new_with_values): Only set
+	gc->colormap if it isn't already set. (Alex Larsson,
+	#90632)
+
 Fri Sep  6 12:41:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/input/gtkimcontextxim.c: Pass the actual input

ChangeLog.pre-2-10

+Fri Sep  6 15:35:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkgc.c (gdk_gc_new_with_values): Only set
+	gc->colormap if it isn't already set. (Alex Larsson,
+	#90632)
+
 Fri Sep  6 12:41:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/input/gtkimcontextxim.c: Pass the actual input

ChangeLog.pre-2-2

+Fri Sep  6 15:35:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkgc.c (gdk_gc_new_with_values): Only set
+	gc->colormap if it isn't already set. (Alex Larsson,
+	#90632)
+
 Fri Sep  6 12:41:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/input/gtkimcontextxim.c: Pass the actual input

ChangeLog.pre-2-4

+Fri Sep  6 15:35:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkgc.c (gdk_gc_new_with_values): Only set
+	gc->colormap if it isn't already set. (Alex Larsson,
+	#90632)
+
 Fri Sep  6 12:41:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/input/gtkimcontextxim.c: Pass the actual input

ChangeLog.pre-2-6

+Fri Sep  6 15:35:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkgc.c (gdk_gc_new_with_values): Only set
+	gc->colormap if it isn't already set. (Alex Larsson,
+	#90632)
+
 Fri Sep  6 12:41:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/input/gtkimcontextxim.c: Pass the actual input

ChangeLog.pre-2-8

+Fri Sep  6 15:35:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkgc.c (gdk_gc_new_with_values): Only set
+	gc->colormap if it isn't already set. (Alex Larsson,
+	#90632)
+
 Fri Sep  6 12:41:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/input/gtkimcontextxim.c: Pass the actual input

gdk/gdkgc.c

@@ -104,9 +104,15 @@ gdk_gc_new_with_values (GdkDrawable	*drawable,
   if (values_mask & GDK_GC_TS_Y_ORIGIN)
     gc->ts_y_origin = values->ts_y_origin;
 
-  gc->colormap = gdk_drawable_get_colormap (drawable);
-  if (gc->colormap)
-    g_object_ref (G_OBJECT (gc->colormap));
+  /* gc->colormap will already be set if gdk_gc_new_with_values()
+   * recurses - as in GdkPixmap => impl object.
+   */
+  if (!gc->colormap)
+    {
+      gc->colormap = gdk_drawable_get_colormap (drawable);
+      if (gc->colormap)
+	g_object_ref (G_OBJECT (gc->colormap));
+    }
   
   return gc;
 }