summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2007-10-30 13:25:41 +0000
committerOwen Taylor <otaylor@src.gnome.org>2007-10-30 13:25:41 +0000
commit26000d1cf8da4636ac092f050bd4adcf523c3c0e (patch)
tree491c3a15b1d5ef288f313ab91165f70d2717f099
parentdc98676780db85d2cd418a0f9abcead122b28f68 (diff)
downloadmetacity-26000d1cf8da4636ac092f050bd4adcf523c3c0e.tar.gz
Don't immediately unminimize an initially iconic window (#491090)
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) svn path=/branches/gnome-2-20/; revision=3367
-rw-r--r--ChangeLog5
-rw-r--r--src/window.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4454b9f5..861aa3ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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-10-28 Jans Granseuer <jensgr@gmx.net>
* src/preview-widget.c (meta_preview_finalize): Free title of
diff --git a/src/window.c b/src/window.c
index fac38259..3c4e8ded 100644
--- a/src/window.c
+++ b/src/window.c
@@ -768,8 +768,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 */