diff options
| author | Daniel Colascione <dancol@dancol.org> | 2014-03-21 05:10:23 -0700 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2014-03-21 05:10:23 -0700 |
| commit | aa4659075414a2730535eeb419847d761eb76f0d (patch) | |
| tree | 557722318abed543cc7a98c5c67fdc4aed8380bf | |
| parent | c4beb8da582e92073ce952e54588b3323bafb6b6 (diff) | |
| download | emacs-aa4659075414a2730535eeb419847d761eb76f0d.tar.gz | |
Code for previous change
| -rw-r--r-- | src/xterm.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c index 1136b671822..c7f56e1f1f2 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -7337,9 +7337,13 @@ x_bitmap_icon (struct frame *f, Lisp_Object file) #ifdef USE_GTK - if (xg_set_icon (f, xg_default_icon_file) - || xg_set_icon_from_xpm_data (f, gnu_xpm_bits)) - return 0; + if (FRAME_DISPLAY_INFO (f)->icon_bitmap_id == -2 + || xg_set_icon (f, xg_default_icon_file) + || xg_set_icon_from_xpm_data (f, gnu_xpm_bits)) + { + FRAME_DISPLAY_INFO (f)->icon_bitmap_id = -2; + return 0; + } #elif defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) |