diff --git a/ChangeLog b/ChangeLog index 48f2271d1a..1b150dad6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 17 23:36:57 1997 Scott Goehring + + * gdk/gdkcc.c (gdk_color_context_free): Caught a stray + gdk_colormap_destroy that Owen missed (and Shawn found). + Wed Dec 17 20:59:52 1997 Owen Taylor * gdk/gdkinput.c gdk/gdkinput.h gdk/gdkinputcommon.h gdk/gdkinputxfree.h gdk/gdkinputgxi.h gdk/gdkinputnone.h. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 48f2271d1a..1b150dad6e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Wed Dec 17 23:36:57 1997 Scott Goehring + + * gdk/gdkcc.c (gdk_color_context_free): Caught a stray + gdk_colormap_destroy that Owen missed (and Shawn found). + Wed Dec 17 20:59:52 1997 Owen Taylor * gdk/gdkinput.c gdk/gdkinput.h gdk/gdkinputcommon.h gdk/gdkinputxfree.h gdk/gdkinputgxi.h gdk/gdkinputnone.h. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 48f2271d1a..1b150dad6e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Dec 17 23:36:57 1997 Scott Goehring + + * gdk/gdkcc.c (gdk_color_context_free): Caught a stray + gdk_colormap_destroy that Owen missed (and Shawn found). + Wed Dec 17 20:59:52 1997 Owen Taylor * gdk/gdkinput.c gdk/gdkinput.h gdk/gdkinputcommon.h gdk/gdkinputxfree.h gdk/gdkinputgxi.h gdk/gdkinputnone.h. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 48f2271d1a..1b150dad6e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Dec 17 23:36:57 1997 Scott Goehring + + * gdk/gdkcc.c (gdk_color_context_free): Caught a stray + gdk_colormap_destroy that Owen missed (and Shawn found). + Wed Dec 17 20:59:52 1997 Owen Taylor * gdk/gdkinput.c gdk/gdkinput.h gdk/gdkinputcommon.h gdk/gdkinputxfree.h gdk/gdkinputgxi.h gdk/gdkinputnone.h. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 48f2271d1a..1b150dad6e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Dec 17 23:36:57 1997 Scott Goehring + + * gdk/gdkcc.c (gdk_color_context_free): Caught a stray + gdk_colormap_destroy that Owen missed (and Shawn found). + Wed Dec 17 20:59:52 1997 Owen Taylor * gdk/gdkinput.c gdk/gdkinput.h gdk/gdkinputcommon.h gdk/gdkinputxfree.h gdk/gdkinputgxi.h gdk/gdkinputnone.h. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 48f2271d1a..1b150dad6e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Dec 17 23:36:57 1997 Scott Goehring + + * gdk/gdkcc.c (gdk_color_context_free): Caught a stray + gdk_colormap_destroy that Owen missed (and Shawn found). + Wed Dec 17 20:59:52 1997 Owen Taylor * gdk/gdkinput.c gdk/gdkinput.h gdk/gdkinputcommon.h gdk/gdkinputxfree.h gdk/gdkinputgxi.h gdk/gdkinputnone.h. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 48f2271d1a..1b150dad6e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Dec 17 23:36:57 1997 Scott Goehring + + * gdk/gdkcc.c (gdk_color_context_free): Caught a stray + gdk_colormap_destroy that Owen missed (and Shawn found). + Wed Dec 17 20:59:52 1997 Owen Taylor * gdk/gdkinput.c gdk/gdkinput.h gdk/gdkinputcommon.h gdk/gdkinputxfree.h gdk/gdkinputgxi.h gdk/gdkinputnone.h. diff --git a/gdk/gdkcc.c b/gdk/gdkcc.c index 8753369556..5364ff7720 100644 --- a/gdk/gdkcc.c +++ b/gdk/gdkcc.c @@ -644,7 +644,7 @@ gdk_color_context_free(GdkColorContext *cc) g_free(cc->cmap); if (cc->need_to_free_colormap) - gdk_colormap_destroy(cc->colormap); + gdk_colormap_unref(cc->colormap); /* free any palette that has been associated with this GdkColorContext */ diff --git a/gdk/x11/gdkcc-x11.c b/gdk/x11/gdkcc-x11.c index 8753369556..5364ff7720 100644 --- a/gdk/x11/gdkcc-x11.c +++ b/gdk/x11/gdkcc-x11.c @@ -644,7 +644,7 @@ gdk_color_context_free(GdkColorContext *cc) g_free(cc->cmap); if (cc->need_to_free_colormap) - gdk_colormap_destroy(cc->colormap); + gdk_colormap_unref(cc->colormap); /* free any palette that has been associated with this GdkColorContext */