From c370a3e5033ebc375068f36df1c120aefadba951 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sun, 18 May 2003 17:16:03 +0000 Subject: [PATCH] revert broken change that assumed foreach_ancestor iterated over the 2003-05-18 Havoc Pennington * src/window.c (unminimize_window_and_all_transient_parents): revert broken change that assumed foreach_ancestor iterated over the window itself. Andrew Sobala, Rob Adams, #113232 ` --- ChangeLog | 7 +++++++ src/window.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4354b11d9..d6b3c2fe4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-05-18 Havoc Pennington + + * src/window.c (unminimize_window_and_all_transient_parents): + revert broken change that assumed foreach_ancestor iterated + over the window itself. Andrew Sobala, Rob Adams, + #113232 + 2003-05-16 Rob Adams Flip the workspace when using up/down/left/right for move window diff --git a/src/window.c b/src/window.c index 816fd11f1..326c188ab 100644 --- a/src/window.c +++ b/src/window.c @@ -168,6 +168,8 @@ maybe_leave_show_desktop_mode (MetaWindow *window) * the desktop via a dialog, then unshow windows again. */ is_desktop_or_dock = FALSE; + is_desktop_or_dock_foreach (window, + &is_desktop_or_dock); meta_window_foreach_ancestor (window, is_desktop_or_dock_foreach, &is_desktop_or_dock); @@ -1999,7 +2001,7 @@ unminimize_func (MetaWindow *window, static void unminimize_window_and_all_transient_parents (MetaWindow *window) { - /* This also iterates over the window itself */ + meta_window_unminimize (window); meta_window_foreach_ancestor (window, unminimize_func, NULL); }