changeset 4593:3623446b34bc

Set icon resource on frame early enough for openbox to find it.
author Stephen J. Turnbull <stephen@xemacs.org>
date Mon, 02 Feb 2009 23:03:31 +0900
parents c6d4ffc018a6
children 2986723ac32d
files src/ChangeLog src/frame-x.c
diffstat 2 files changed, 14 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Jan 31 17:43:20 2009 +0000
+++ b/src/ChangeLog	Mon Feb 02 23:03:31 2009 +0900
@@ -1,3 +1,9 @@
+2009-02-02  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* frame-x.c (x_init_frame_2): Placate openbox by calling
+	update_frame_icon.  Suggested by Henry S. Thompson
+	<ht@inf.ed.ac.uk> in <f5btz7ghm5k@hildegard.inf.ed.ac.uk>.
+
 2009-01-31  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* unicode.c (unicode_convert): 
--- a/src/frame-x.c	Sat Jan 31 17:43:20 2009 +0000
+++ b/src/frame-x.c	Mon Feb 02 23:03:31 2009 +0900
@@ -2160,6 +2160,14 @@
    *   We'll just  need to be careful in the modeline specs.
    */
   update_frame_title (f);
+  /* Henry S. Thompson:
+   * Must set icon resource before mapping frame, or some WMs may
+   * lose the icon (openbox).  See <f5bhc3efb17@hildegard.inf.ed.ac.uk>.
+   * SJT:
+   * This probably means that the frame-icon library won't work with
+   * that WM.
+   */
+  update_frame_icon (f);
 }
 
 static void