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.

diff --git a/src/ChangeLog b/src/ChangeLog
index c857430a8cf830d4794e102c41b0968a94b163e6..f66478264630dc0927f784b4d235e18fcf99bf25 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/xterm.c b/src/xterm.c
index 8cc6475de5378833bd268330830aab90441a2898..0640208ca1473ec47234cb56aceb7bd99f8965ab 100644 (file)
--- a/src/xterm.c
+++ b/src/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;