From 6c7eb7212c99c54a6169dc0a6dc4a8a7f151407a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Sat, 13 Aug 2005 09:49:10 +0000 Subject: [PATCH] * 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. --- src/ChangeLog | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 + + * 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 * image.c (syms_of_image): Init image_types here, and call define_image_type. -- 2.39.2