summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2002-02-09 17:41:42 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-02-09 17:41:42 +0000
commit7b9eccb489b1e886f9a275f74cc40acce9500c53 (patch)
treef5e01b7c9da24ae514d7e6b29073289a94c33fbc
parent339bdf8dd21d024b4f5bf382590702c0f8b28034 (diff)
downloadmetacity-7b9eccb489b1e886f9a275f74cc40acce9500c53.tar.gz
assign last_window prior to ++newp, so we don't try to stack windows with
2002-02-09 Havoc Pennington <hp@pobox.com> * src/stack.c (meta_stack_sync_to_server): assign last_window prior to ++newp, so we don't try to stack windows with respect to themselves. Fixes some obscure stacking bugs.
-rw-r--r--ChangeLog6
-rw-r--r--src/stack.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 07f00f25..3b98b573 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2002-02-09 Havoc Pennington <hp@pobox.com>
+ * src/stack.c (meta_stack_sync_to_server): assign last_window
+ prior to ++newp, so we don't try to stack windows with respect to
+ themselves. Fixes some obscure stacking bugs.
+
+2002-02-09 Havoc Pennington <hp@pobox.com>
+
* src/theme-parser.c: try to make more error message strings the
same, easier for translators
diff --git a/src/stack.c b/src/stack.c
index 813287ee..9965ea40 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -660,7 +660,7 @@ meta_stack_sync_to_server (MetaStack *stack)
/* Try to do minimal window moves to get the stack in order */
/* A point of note: these arrays include frames not client windows,
* so if a client window has changed frame since last_root_children_stacked
- * as saved, then we may have inefficiency, but I don't think things
+ * was saved, then we may have inefficiency, but I don't think things
* break...
*/
const Window *old_stack = (Window *) stack->last_root_children_stacked->data;
@@ -680,8 +680,8 @@ meta_stack_sync_to_server (MetaStack *stack)
{
/* Stacks are the same here, move on */
++oldp;
- ++newp;
last_window = *newp;
+ ++newp;
}
else if (meta_display_lookup_x_window (stack->screen->display,
*oldp) == NULL)