check if info->colormap != NULL before unref'ing it. It might have been

2001-08-06  Sven Neumann  <sven@gimp.org>

	* gdk/gdkpango.c (gdk_pango_context_destroy):
	check if info->colormap != NULL before unref'ing it. It might have
	been set to NULL using gdk_pango_context_set_colormap().

8 files changed, 45 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 87a002e5ca..68b6b44f2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-06  Sven Neumann  <sven@gimp.org>
+
+	* gdk/gdkpango.c (gdk_pango_context_destroy): 
+	check if info->colormap != NULL before unref'ing it. It might have
+	been set to NULL using gdk_pango_context_set_colormap().
+
 Sun Aug  5 11:24:27 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_set_current_alpha): 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 87a002e5ca..68b6b44f2b 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-08-06  Sven Neumann  <sven@gimp.org>
+
+	* gdk/gdkpango.c (gdk_pango_context_destroy): 
+	check if info->colormap != NULL before unref'ing it. It might have
+	been set to NULL using gdk_pango_context_set_colormap().
+
 Sun Aug  5 11:24:27 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_set_current_alpha): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 87a002e5ca..68b6b44f2b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-08-06  Sven Neumann  <sven@gimp.org>
+
+	* gdk/gdkpango.c (gdk_pango_context_destroy): 
+	check if info->colormap != NULL before unref'ing it. It might have
+	been set to NULL using gdk_pango_context_set_colormap().
+
 Sun Aug  5 11:24:27 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_set_current_alpha): 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 87a002e5ca..68b6b44f2b 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-08-06  Sven Neumann  <sven@gimp.org>
+
+	* gdk/gdkpango.c (gdk_pango_context_destroy): 
+	check if info->colormap != NULL before unref'ing it. It might have
+	been set to NULL using gdk_pango_context_set_colormap().
+
 Sun Aug  5 11:24:27 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_set_current_alpha): 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 87a002e5ca..68b6b44f2b 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-08-06  Sven Neumann  <sven@gimp.org>
+
+	* gdk/gdkpango.c (gdk_pango_context_destroy): 
+	check if info->colormap != NULL before unref'ing it. It might have
+	been set to NULL using gdk_pango_context_set_colormap().
+
 Sun Aug  5 11:24:27 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_set_current_alpha): 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 87a002e5ca..68b6b44f2b 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-08-06  Sven Neumann  <sven@gimp.org>
+
+	* gdk/gdkpango.c (gdk_pango_context_destroy): 
+	check if info->colormap != NULL before unref'ing it. It might have
+	been set to NULL using gdk_pango_context_set_colormap().
+
 Sun Aug  5 11:24:27 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_set_current_alpha): 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 87a002e5ca..68b6b44f2b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-08-06  Sven Neumann  <sven@gimp.org>
+
+	* gdk/gdkpango.c (gdk_pango_context_destroy): 
+	check if info->colormap != NULL before unref'ing it. It might have
+	been set to NULL using gdk_pango_context_set_colormap().
+
 Sun Aug  5 11:24:27 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_set_current_alpha): 
diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index 4eeae8face..d4f11d9876 100644
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -52,7 +52,8 @@ static void gdk_pango_get_item_properties (PangoItem      *item,
 static void
 gdk_pango_context_destroy (GdkPangoContextInfo *info)
 {
-  gdk_colormap_unref (info->colormap);
+  if (info->colormap)
+    gdk_colormap_unref (info->colormap);
   g_free (info);
 }
 
@@ -336,7 +337,7 @@ gdk_draw_layout_line_with_colors (GdkDrawable      *drawable,
 }
 
 /**
- * gdk_draw_layout:
+ * gdk_draw_layout_with_colors:
  * @drawable:  the drawable on which to draw string
  * @gc:        base graphics context to use
  * @x:         the X position of the left of the layout (in pixels)