# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1123926550 0
# Node ID 8355c7d6253cfb80af9834b3ff1d4de2b332f0db
# Parent  9ac98d57e0e7ca4cf47352b4548c67197f48cd18
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
(xg_get_image_for_pixmap): Move some code to
xg_get_pixbuf_from_pix_and_mask, and call it.

* gtkutil.h (xg_get_pixbuf_from_pix_and_mask): Declare.

* xterm.c (x_wm_set_icon_pixmap): Call xg_get_pixbuf_from_pix_and_mask
to get an GTK icon and set it with GTK functions to avoid having GTK
override an icon set with just X functions.

diff -r 9ac98d57e0e7 -r 8355c7d6253c src/ChangeLog
--- a/src/ChangeLog	Sat Aug 13 09:48:36 2005 +0000
+++ b/src/ChangeLog	Sat Aug 13 09:49:10 2005 +0000
@@ -1,3 +1,15 @@
+2005-08-13  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
+	(xg_get_image_for_pixmap): Move some code to
+	xg_get_pixbuf_from_pix_and_mask, and call it.
+
+	* gtkutil.h (xg_get_pixbuf_from_pix_and_mask): Declare.
+
+	* xterm.c (x_wm_set_icon_pixmap): Call xg_get_pixbuf_from_pix_and_mask
+	to get an GTK icon and set it with GTK functions to avoid having GTK
+	override an icon set with just X functions.
+
 2005-08-11  Richard M. Stallman  <rms@gnu.org>
 
 	* image.c (syms_of_image): Init image_types here, and call define_image_type.