diff --git a/ChangeLog b/ChangeLog
index aba4ef481a..5cb0ac1ada 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-28  Sven Herzberg  <herzi@gnome-de.org>
+
+	reviewed by: Tim Janik
+
+	* gtk/gtkpixmap.c: (gtk_pixmap_set): only check for equal colormaps if
+	the new pixmap is not NULL; fixes a warning when gtk_pixmap_set is
+	called from gtk_pixmap_finalize (bug 336254)
+
 2006-03-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkmnemonichash.c (_gtk_mnemonic_hash_activate): Check that 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index aba4ef481a..5cb0ac1ada 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2006-03-28  Sven Herzberg  <herzi@gnome-de.org>
+
+	reviewed by: Tim Janik
+
+	* gtk/gtkpixmap.c: (gtk_pixmap_set): only check for equal colormaps if
+	the new pixmap is not NULL; fixes a warning when gtk_pixmap_set is
+	called from gtk_pixmap_finalize (bug 336254)
+
 2006-03-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkmnemonichash.c (_gtk_mnemonic_hash_activate): Check that 
diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c
index 0dade04320..86d66ed05a 100644
--- a/gtk/gtkpixmap.c
+++ b/gtk/gtkpixmap.c
@@ -131,7 +131,8 @@ gtk_pixmap_set (GtkPixmap *pixmap,
   gint oldheight;
 
   g_return_if_fail (GTK_IS_PIXMAP (pixmap));
-  g_return_if_fail (gdk_colormap_get_visual (gtk_widget_get_colormap (GTK_WIDGET (pixmap)))->depth == gdk_drawable_get_depth (GDK_DRAWABLE (val)));
+  if (GDK_IS_DRAWABLE(val))
+    g_return_if_fail (gdk_colormap_get_visual (gtk_widget_get_colormap (GTK_WIDGET (pixmap)))->depth == gdk_drawable_get_depth (GDK_DRAWABLE (val)));
 
   if (pixmap->pixmap != val)
     {