[Emacs-diffs] master 6f3f605: Fix setting icon for Gtk+ on non-initial frame.

[Jan D.]

branch: master
commit 6f3f6050607cf64cb5728af1ff871b8c5e994661
Author: Jan D <address@hidden>
Commit: Jan D <address@hidden>

    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.
---
 src/ChangeLog |    5 +++++
 src/xterm.c   |    3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index c857430..f664782 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-22  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        Use bool for boolean in xterm.c
diff --git a/src/xterm.c b/src/xterm.c
index 8cc6475..0640208 100644
--- 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;