From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Wed, 31 Jan 2007 12:30:48 +0000 (+0000)
Subject: Colin Watson has fixed the disgusting icons on GTK1. His patch
X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/commitdiff_plain/ae50c9309760d894ce47df6aab530f66aa32278f

Colin Watson has fixed the disgusting icons on GTK1. His patch
appears to merely fix the background colour (arranging for it to
have transparency rather than being on some kind of default grey
background), but it turns out to also fix the strange blurry
behaviour I see in the GNOME Taskbar, for no very obvious reason.


git-svn-id: svn://svn.tartarus.org/sgt/putty@7186 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index d0b46931..430e2b58 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -3306,6 +3306,7 @@ void set_window_icon(GtkWidget *window, const char *const *const *icon,
 		     int n_icon)
 {
     GdkPixmap *iconpm;
+    GdkBitmap *iconmask;
 #if GTK_CHECK_VERSION(2,0,0)
     GList *iconlist;
     int n;
@@ -3315,9 +3316,9 @@ void set_window_icon(GtkWidget *window, const char *const *const *icon,
 	return;
 
     gtk_widget_realize(window);
-    iconpm = gdk_pixmap_create_from_xpm_d(window->window, NULL,
+    iconpm = gdk_pixmap_create_from_xpm_d(window->window, &iconmask,
 					  NULL, (gchar **)icon[0]);
-    gdk_window_set_icon(window->window, NULL, iconpm, NULL);
+    gdk_window_set_icon(window->window, NULL, iconpm, iconmask);
 
 #if GTK_CHECK_VERSION(2,0,0)
     iconlist = NULL;