From: Mikael Magnusson <mikachu@comhem.se>
Date: Fri, 13 Jul 2007 14:14:02 +0000 (+0200)
Subject: use dock_get_area instead of accessing dock struct directly
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=355981bf14a888b310be40018f9b7d35bc05e606;p=chaz%2Fopenbox

use dock_get_area instead of accessing dock struct directly
---

diff --git a/openbox/client.c b/openbox/client.c
index f38a0c01..787ed673 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -64,8 +64,6 @@ typedef struct
 
 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 @@ void client_find_edge_directional(ObClient *self, ObDirection dir,
 {
     GList *it;
     Rect *a, *mon;
+    Rect dock_area;
     gint edge;
 
     a = screen_area(self->desktop, SCREEN_AREA_ALL_MONITORS,
@@ -4004,7 +4003,8 @@ void client_find_edge_directional(ObClient *self, ObDirection dir,
         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);
 }
 
diff --git a/openbox/dock.c b/openbox/dock.c
index 22e4523c..8cb40fb6 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -31,7 +31,7 @@
                          EnterWindowMask | LeaveWindowMask)
 #define DOCKAPP_EVENT_MASK (StructureNotifyMask)
 
-ObDock *dock;
+static ObDock *dock;
 
 StrutPartial dock_strut;