summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/screen.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/core/screen.c b/src/core/screen.c
index 89c18463b..efd6f4101 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -883,9 +883,9 @@ meta_screen_free (MetaScreen *screen,
void
meta_screen_manage_all_windows (MetaScreen *screen)
{
- Window ignored1, ignored2;
+ Window *_children;
Window *children;
- guint n_children, i;
+ int n_children, i;
meta_display_grab (screen->display);
@@ -894,10 +894,10 @@ meta_screen_manage_all_windows (MetaScreen *screen)
screen);
meta_stack_freeze (screen->stack);
+ meta_stack_tracker_get_stack (screen->stack_tracker, &_children, &n_children);
- XQueryTree (screen->display->xdisplay,
- screen->xroot,
- &ignored1, &ignored2, &children, &n_children);
+ /* Copy the stack as it will be modified as part of the loop */
+ children = g_memdup (_children, sizeof (Window) * n_children);
for (i = 0; i < n_children; ++i)
{
@@ -905,9 +905,7 @@ meta_screen_manage_all_windows (MetaScreen *screen)
META_COMP_EFFECT_NONE);
}
- if (children)
- XFree (children);
-
+ g_free (children);
meta_stack_thaw (screen->stack);
meta_display_ungrab (screen->display);