# HG changeset patch
# User "Ville Skyttä <scop@xemacs.org>"
# Date 1236545533 -7200
# Node ID a1dd514df5c6e10d9592a90190d96aa7e1551949
# Parent  877ad4697eea740a3b0ac3c4abedc4a5066dc45d
Apply the 2008-03-05 change from Dominique Quatravaux in init_image_instance_from_gdk_pixmap as well even though the code is not enabled at the moment

diff -r 877ad4697eea -r a1dd514df5c6 src/ChangeLog
--- a/src/ChangeLog	Sun Mar 08 23:40:45 2009 +0900
+++ b/src/ChangeLog	Sun Mar 08 22:52:13 2009 +0200
@@ -1,3 +1,9 @@
+2009-03-08  Ville Skyttä  <scop@xemacs.org>
+
+	* glyphs-gtk.c (init_image_instance_from_gdk_pixmap): Apply the
+	2008-03-05 change from Dominique Quatravaux here as well even
+	though the code is not enabled at the moment.
+
 2009-02-04  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* eval.c (skip_debugger): Fix typo in preceding comment.
diff -r 877ad4697eea -r a1dd514df5c6 src/glyphs-gtk.c
--- a/src/glyphs-gtk.c	Sun Mar 08 23:40:45 2009 +0900
+++ b/src/glyphs-gtk.c	Sun Mar 08 22:52:13 2009 +0200
@@ -837,7 +837,7 @@
 
   IMAGE_INSTANCE_PIXMAP_FILENAME (ii) = Qnil;
   IMAGE_INSTANCE_GTK_PIXMAP (ii) = gdk_pixmap;
-  IMAGE_INSTANCE_GTK_MASK (ii) = 0;
+  IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0;
   IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = width;
   IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = height;
   IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = depth;