summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@ubuntu.com>2006-09-07 23:00:27 +0000
committerElijah Newren <newren@src.gnome.org>2006-09-07 23:00:27 +0000
commit3800dac4921aeb769ae748579740b896d0fec8f7 (patch)
treeeecd0038ee8a5651b9b4c6d93e0731f9c58ba5ea
parentbba4df71870ac9bba3d1d27b631c7de734d514f9 (diff)
downloadmetacity-3800dac4921aeb769ae748579740b896d0fec8f7.tar.gz
Clear window->xtransient_for after emitting the invalid window warning.
2006-08-30 Colin Watson <cjwatson@ubuntu.com> * src/window-props.c (reload_transient_for): Clear window->xtransient_for after emitting the invalid window warning. #353540
-rw-r--r--ChangeLog6
-rw-r--r--src/window-props.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 911cdb8a..cbc537fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-30 Colin Watson <cjwatson@ubuntu.com>
+
+ * src/window-props.c (reload_transient_for): Clear
+ window->xtransient_for after emitting the invalid window warning.
+ #353540
+
2006-09-07 Elijah Newren <newren gmail com>
* src/metacity-dialog.c: Patch from Bruno Boaventura de Oliveira
diff --git a/src/window-props.c b/src/window-props.c
index 7c20de50..daf4c03c 100644
--- a/src/window-props.c
+++ b/src/window-props.c
@@ -1174,10 +1174,10 @@ reload_transient_for (MetaWindow *window,
meta_display_lookup_x_window (window->display,
window->xtransient_for) == NULL)
{
- window->xtransient_for = None;
meta_warning (_("Invalid WM_TRANSIENT_FOR window 0x%lx specified "
"for %s.\n"),
window->xtransient_for, window->desc);
+ window->xtransient_for = None;
}
window->transient_parent_is_root_window =