X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gdk%2Fgdkpixmap.c;h=6fc47e316e73bbfa5e9ebd4595b02401649b64d1;hb=95b3f3e46016e4993e60e8c139bfd03a106201ba;hp=22e5a078677b1088bf81538eddfa144cfc5c8ccb;hpb=279e878bddb61086f813385dc94fd04a5465473a;p=~andy%2Fgtk

diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c
index 22e5a0786..6fc47e316 100644
--- a/gdk/gdkpixmap.c
+++ b/gdk/gdkpixmap.c
@@ -518,7 +518,7 @@ _gdk_pixmap_create_from_xpm (GdkWindow  *window,
       
       color_name = gdk_pixmap_extract_color (buffer);
       
-      if (color_name == NULL ||
+      if (color_name == NULL || g_strcasecmp (color_name, "None") == 0 ||
 	  gdk_color_parse (color_name, &color->color) == FALSE)
 	{
 	  color->color = *transparent_color;
@@ -817,7 +817,8 @@ void
 gdk_pixmap_unref (GdkPixmap *pixmap)
 {
   GdkWindowPrivate *private = (GdkWindowPrivate *)pixmap;
-  g_return_if_fail(pixmap != NULL);
+  g_return_if_fail (pixmap != NULL);
+  g_return_if_fail (private->ref_count > 0);
 
   private->ref_count -= 1;
   if (private->ref_count == 0)