remove the ob_root var, its redundant of what Xlib already provides

[chaz/openbox] / openbox / stacking.c

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 3a556fc4abb24f71a78efb3a856f366a0b798b8e..5b9b37b2958134e1a4d7dace6c466cc3206c1346 100644 (file)
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -1,11 +1,11 @@
 #include "openbox.h"
 #include "prop.h"
+#include "screen.h"
 #include "focus.h"
 #include "client.h"
 #include "group.h"
 #include "frame.h"
 #include "window.h"
-#include <glib.h>
 
 GList  *stacking_list = NULL;
 
@@ -30,8 +30,8 @@ void stacking_set_list()
         }
     }
 
-    PROP_SETA32(ob_root, net_client_list_stacking, window,
-                (guint32*)windows, i);
+    PROP_SETA32(RootWindow(ob_display, ob_screen),
+                net_client_list_stacking, window, (guint32*)windows, i);
 
     g_free(windows);
 }
@@ -53,7 +53,7 @@ static void do_restack(GList *wins, GList *before)
     win = g_new(Window, g_list_length(wins) + 1);
 
     if (before == stacking_list)
-        win[0] = focus_backup;
+        win[0] = screen_support_win;
     else if (!before)
         win[0] = window_top(g_list_last(stacking_list)->data);
     else
@@ -267,7 +267,7 @@ void stacking_add(ObWindow *win)
     ObStackingLayer l;
     GList *wins;
 
-    g_assert(focus_backup != None); /* make sure I dont break this in the
+    g_assert(screen_support_win != None); /* make sure I dont break this in the
                                        future */
 
     l = window_layer(win);