diff --git a/ChangeLog b/ChangeLog index 8389489a9a..2fd45556ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Sep 6 15:35:01 2002 Owen Taylor + + * 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 * modules/input/gtkimcontextxim.c: Pass the actual input diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8389489a9a..2fd45556ff 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Sep 6 15:35:01 2002 Owen Taylor + + * 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 * modules/input/gtkimcontextxim.c: Pass the actual input diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8389489a9a..2fd45556ff 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Sep 6 15:35:01 2002 Owen Taylor + + * 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 * modules/input/gtkimcontextxim.c: Pass the actual input diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8389489a9a..2fd45556ff 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Sep 6 15:35:01 2002 Owen Taylor + + * 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 * modules/input/gtkimcontextxim.c: Pass the actual input diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8389489a9a..2fd45556ff 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Sep 6 15:35:01 2002 Owen Taylor + + * 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 * modules/input/gtkimcontextxim.c: Pass the actual input diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8389489a9a..2fd45556ff 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Sep 6 15:35:01 2002 Owen Taylor + + * 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 * modules/input/gtkimcontextxim.c: Pass the actual input diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c index 0c69e10851..3066399aa9 100644 --- a/gdk/gdkgc.c +++ b/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; }