oops buttons not keycodes

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index b312aba9b73d443b3305187871b5e3c6a7f0d6ca..1b9887d95ecdd529182c7919ee9fdcb90d373113 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -353,8 +353,8 @@ void screen_resize()
     if (ob_state() == OB_STATE_STARTING)
        return;
 
-    dock_configure();
     screen_update_areas();
+    dock_configure();
 
     for (it = client_list; it; it = it->next)
         client_move_onscreen(it->data, FALSE);
@@ -637,8 +637,6 @@ void screen_update_areas()
 {
     guint i, x;
     guint32 *dims;
-    Rect **old_area = area;
-    Rect **rit;
     GList *it;
 
     g_free(monitor_area);
@@ -657,7 +655,6 @@ void screen_update_areas()
      
     dims = g_new(guint32, 4 * screen_num_desktops);
 
-    rit = old_area;
     for (i = 0; i < screen_num_desktops + 1; ++i) {
         Strut s;
         int l, r, t, b;
@@ -800,7 +797,7 @@ void screen_update_areas()
         }
     }
     PROP_SETA32(RootWindow(ob_display, ob_screen), net_workarea, cardinal,
-               dims, 4 * screen_num_desktops);
+                dims, 4 * screen_num_desktops);
 
     g_free(dims);
 }