procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix setting icon for Gtk+ on non-initial frame.

Browse source 
Fixes: debbugs:19403

* xterm.c (x_bitmap_icon): Partly revert change from 2014-03-21 which
breaks icon setting for Gtk+ except for initial frame.
This commit is contained in:
Jan D 2014-12-22 09:19:37 +01:00
parent 4dc78f6478
commit 6f3f605060
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2014-12-22 Jan Djärv <jan.h.d@swipnet.se>
* xterm.c (x_bitmap_icon): Partly revert change from 2014-03-21 which
breaks icon setting for Gtk+ except for initial frame (Bug#19403).
2014-12-22 Paul Eggert <eggert@cs.ucla.edu>
Use bool for boolean in xterm.c

3
src/xterm.c
View file

@ -8234,8 +8234,7 @@ x_bitmap_icon (struct frame *f, Lisp_Object file)
#ifdef USE_GTK
if (FRAME_DISPLAY_INFO (f)->icon_bitmap_id == -2
|| xg_set_icon (f, xg_default_icon_file)
if (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;