M openbox/client.c → openbox/client.c

@@ -64,8 +64,6 @@ } ClientCallback;
 
 GList            *client_list          = NULL;
 
-extern ObDock *dock;
-
 static GSList *client_destroy_notifies = NULL;
 
 static void client_get_all(ObClient *self, gboolean real);
@@ -3948,6 +3946,7 @@ gint *dest, gboolean *near_edge)
 {
     GList *it;
     Rect *a, *mon;
+    Rect dock_area;
     gint edge;
 
     a = screen_area(self->desktop, SCREEN_AREA_ALL_MONITORS,
@@ -4004,7 +4003,8 @@ 
         detect_edge(cur->frame->area, dir, my_head, my_size, my_edge_start,
                     my_edge_size, dest, near_edge);
     }
-    detect_edge(dock->area, dir, my_head, my_size, my_edge_start,
+    dock_get_area(&dock_area);
+    detect_edge(dock_area, dir, my_head, my_size, my_edge_start,
                 my_edge_size, dest, near_edge);
 }
 

M openbox/dock.c → openbox/dock.c

@@ -31,7 +31,7 @@ #define DOCK_EVENT_MASK (ButtonPressMask | ButtonReleaseMask | \
                          EnterWindowMask | LeaveWindowMask)
 #define DOCKAPP_EVENT_MASK (StructureNotifyMask)
 
-ObDock *dock;
+static ObDock *dock;
 
 StrutPartial dock_strut;