summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2008-03-28 18:44:59 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-03-28 18:44:59 +0000
commit58ef1592a5d9d2a0577da977cb27f417032718cf (patch)
tree73d58b518b642f1d053d9ff99bf6307186ac9e62
parent9730f154110df07db79c050735d70fe7c81b5cdc (diff)
downloadmetacity-58ef1592a5d9d2a0577da977cb27f417032718cf.tar.gz
Don't immediately unminimize an initially iconic window (#491090)
2008-03-28 Owen Taylor <otaylor@redhat.com> * src/core/window.c (meta_window_new_with_attrs): Don't immediately unminimize an initially iconic window (#491090) svn path=/trunk/; revision=3667
-rw-r--r--ChangeLog5
-rw-r--r--src/core/window.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fd86c7e..40bc0120 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-28 Owen Taylor <otaylor@redhat.com>
+
+ * src/core/window.c (meta_window_new_with_attrs): Don't
+ immediately unminimize an initially iconic window (#491090)
+
2008-03-27 Thomas Thurman <tthurman@gnome.org>
* src/core/session.c (regenerate_save_file, save_state, load_state):
diff --git a/src/core/window.c b/src/core/window.c
index 3e6eb58e..d1c32daf 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -799,8 +799,11 @@ meta_window_new_with_attrs (MetaDisplay *display,
* 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 */