Commit 6f3f6050 authored by Jan D's avatar Jan D
Browse files

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

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.
parent 4dc78f64
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
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment