From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sat, 13 Aug 2005 09:49:10 +0000 (+0000)
Subject: * gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
X-Git-Tag: emacs-pretest-22.0.90~7611
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c7eb7212c99c54a6169dc0a6dc4a8a7f151407a;p=emacs.git

* 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 --git a/src/ChangeLog b/src/ChangeLog
index 7a572c8271c..bd891a54015 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.