summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2016-04-08 17:26:34 -0700
committerJasper St. Pierre <jstpierre@mecheye.net>2016-04-08 17:28:26 -0700
commit75e6029206c701c32ead086d2a5f5a3c5cd239d7 (patch)
tree774350085d6526f2adf2e3f91ebcfdd2d9612c8e
parente017148208a1b69bb3b3951521af14f346ff4db4 (diff)
downloadmutter-75e6029206c701c32ead086d2a5f5a3c5cd239d7.tar.gz
stack: Fix 32-bit issues
Since g_array_append_val isn't smart enough to do a proper upcast, we have to do it manually, lest we get junk. This fixes various RAISE_ABOVE: window not in stack: 0x8100c8003 warnings that appear on 32-bit systems.
-rw-r--r--src/core/stack.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/stack.c b/src/core/stack.c
index a3879f760..adccae0f9 100644
--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -1061,7 +1061,7 @@ stack_sync_to_xserver (MetaStack *stack)
for (tmp = g_list_last(stack->sorted); tmp != NULL; tmp = tmp->prev)
{
MetaWindow *w = tmp->data;
- Window top_level_window;
+ guint64 top_level_window;
guint64 stack_id;
if (w->unmanaging)
@@ -1100,7 +1100,8 @@ stack_sync_to_xserver (MetaStack *stack)
/* The screen guard window sits above all hidden windows and acts as
* a barrier to input reaching these windows. */
- g_array_append_val (x11_hidden_stack_ids, stack->screen->guard_window);
+ guint64 guard_window_id = stack->screen->guard_window;
+ g_array_append_val (x11_hidden_stack_ids, guard_window_id);
/* Sync to server */