diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2007-07-13 16:14:02 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2007-07-13 16:14:02 +0200 |
| commit | 355981bf14a888b310be40018f9b7d35bc05e606 (patch) | |
| tree | b895ca3db26b51aa13d1ae2a26a63a17549c9fb8 /openbox | |
| parent | fc32204f3c1733b289d7f03a15f9f0a568369989 (diff) | |
use dock_get_area instead of accessing dock struct directly
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/client.c | 6 | ||||
| -rw-r--r-- | openbox/dock.c | 2 |
2 files changed, 4 insertions, 4 deletions
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; |