aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1995-06-05 17:39:17 +0000
committerKarl Heuer1995-06-05 17:39:17 +0000
commitbaf540d69ccfd95b8721f79767907da99820ec26 (patch)
tree013063fec24dffccf58601aca4188311776e8180
parent33a3543461e21301aad2b648b8ce67d3cfaed773 (diff)
downloademacs-baf540d69ccfd95b8721f79767907da99820ec26.tar.gz
emacs-baf540d69ccfd95b8721f79767907da99820ec26.zip
(x_wm_set_icon_pixmap): Set IconPixmapHint in both cases.
-rw-r--r--src/xterm.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/xterm.c b/src/xterm.c
index eef6efd152c..0881067392c 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5518,14 +5518,11 @@ x_wm_set_icon_pixmap (f, pixmap_id)
5518 { 5518 {
5519 Pixmap icon_pixmap = x_bitmap_pixmap (f, pixmap_id); 5519 Pixmap icon_pixmap = x_bitmap_pixmap (f, pixmap_id);
5520 f->display.x->wm_hints.icon_pixmap = icon_pixmap; 5520 f->display.x->wm_hints.icon_pixmap = icon_pixmap;
5521 f->display.x->wm_hints.flags |= IconPixmapHint;
5522 } 5521 }
5523 else 5522 else
5524 { 5523 f->display.x->wm_hints.icon_pixmap = None;
5525 f->display.x->wm_hints.icon_pixmap = None;
5526 f->display.x->wm_hints.flags &= ~IconPixmapHint;
5527 }
5528 5524
5525 f->display.x->wm_hints.flags |= IconPixmapHint;
5529 XSetWMHints (FRAME_X_DISPLAY (f), window, &f->display.x->wm_hints); 5526 XSetWMHints (FRAME_X_DISPLAY (f), window, &f->display.x->wm_hints);
5530} 5527}
5531 5528