summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2005-06-02 15:24:40 +0000
committerElijah Newren <newren@src.gnome.org>2005-06-02 15:24:40 +0000
commit90dc2116ad179b4dcfcc715db66ca6df4067fc9a (patch)
treea16c0f92b2de1c40571b4d018207bc3aeefe6572
parentd5eaa386dddeb7c1df3bbea05e5fdbfc1ddcc9b8 (diff)
downloadmetacity-90dc2116ad179b4dcfcc715db66ca6df4067fc9a.tar.gz
if the window has a modal transient which is being unmanaged, don't focus
2005-06-02 Elijah Newren <newren@gmail.com> * src/window.c (meta_window_focus): if the window has a modal transient which is being unmanaged, don't focus it. Fixes the Metacity issue reported in #305362.
-rw-r--r--ChangeLog6
-rw-r--r--src/window.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 790669ec..a2300b92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-02 Elijah Newren <newren@gmail.com>
+
+ * src/window.c (meta_window_focus): if the window has a modal
+ transient which is being unmanaged, don't focus it. Fixes the
+ Metacity issue reported in #305362.
+
2005-05-30 Ray Strode <rstrode@redhat.com>
Bug 305564 again.
diff --git a/src/window.c b/src/window.c
index d5bd0ac1..385bc429 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3519,7 +3519,8 @@ meta_window_focus (MetaWindow *window,
}
modal_transient = get_modal_transient (window);
- if (modal_transient != NULL)
+ if (modal_transient != NULL &&
+ !modal_transient->unmanaging)
{
meta_topic (META_DEBUG_FOCUS,
"%s has %s as a modal transient, so focusing it instead.\n",