merge r7578 from trunk

diff --git a/openbox/screen.c b/openbox/screen.c
index f9b1eb6c643da0489eb01ff139b8e794db1335ca..c39204ddd69da9dcac339c3ad8fa8d61948acde3 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -529,7 +529,7 @@ void screen_set_num_desktops(guint num)
             else if (screen_desktop == num - 1 &&
                      (c->desktop == DESKTOP_ALL ||
                       c->desktop == screen_desktop))
-                stacking_raise(WINDOW_AS_CLIENT(c));
+                stacking_raise(CLIENT_AS_WINDOW(c));
         }
     }