Index: ChangeLog
===================================================================
--- ChangeLog	(revision 3362)
+++ ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+2007-10-28  Owen Taylor  <otaylor@redhat.com>
+
+	* src/window.c (meta_window_new_with_attrs): Don't immediately
+	unminimize an initially iconic window (#491090)
+
 2007-09-15  Elijah Newren  <newren gmail com>
 
 	* configure.in: post-release version bump to 2.20.1
Index: src/window.c
===================================================================
--- src/window.c	(revision 3362)
+++ src/window.c	(working copy)
@@ -768,8 +768,11 @@
    * However, we shouldn't unminimize windows here when opening
    * a new display because that breaks passing _NET_WM_STATE_HIDDEN
    * between window managers when replacing them; see bug 358042.
+   *
+   * And we shouldn't unminimize windows if they were initially
+   * iconic.
    */
-  if (!display->display_opening)
+  if (!display->display_opening && !window->initially_iconic)
     unminimize_window_and_all_transient_parents (window);
 
   meta_error_trap_pop (display, FALSE); /* pop the XSync()-reducing trap */
