From: Jan D <jan.h.d@swipnet.se>
Date: Mon, 22 Dec 2014 08:19:37 +0000 (+0100)
Subject: Fix setting icon for Gtk+ on non-initial frame.
X-Git-Tag: emacs-25.0.90~2635^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6f3f6050607cf64cb5728af1ff871b8c5e994661;p=emacs.git

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 c857430a8cf..f6647826463 100644
--- 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 8cc6475de53..0640208ca14 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;