merge r7667 from trunk

diff --git a/openbox/screen.c b/openbox/screen.c
index 6dd7bc28649097bab466c25880537bad948aa6b0..e619509e231b8228a5d0374afad2dc6d1dc8c628 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -1284,8 +1284,10 @@ void screen_update_areas()
             dims[(i * screen_num_desktops + j) * 4 + 3] -= t + b;
         }
 
+    /* all the work areas are not used here, only the ones for the first
+       monitor are */
     PROP_SETA32(RootWindow(ob_display, ob_screen), net_workarea, cardinal,
-                dims, 4 * screen_num_desktops * screen_num_monitors);
+                dims, 4 * screen_num_desktops);
 
     /* the area has changed, adjust all the windows if they need it */
     for (it = client_list; it; it = g_list_next(it))