X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;h=3a58344e1a423397cf75a7a0243339d0890976a5;hb=4eb9a0c59efb6bfd598e35fe692e6b4b994e499c;hp=d1f6b2946a59a238198bd2aea367afcd5b24cc73;hpb=6014a41760a107d817422aa5412ccf0ce3fc6e92;p=chaz%2Fopenbox

diff --git a/openbox/dock.c b/openbox/dock.c
index d1f6b294..3a58344e 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -80,7 +80,7 @@ void dock_startup(gboolean reconfig)
     STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
                       0, 0, 0, 0, 0, 0, 0, 0);
 
-    dock = g_new0(ObDock, 1);
+    dock = g_slice_new0(ObDock);
     dock->obwin.type = OB_WINDOW_CLASS_DOCK;
 
     dock->hidden = TRUE;
@@ -129,6 +129,8 @@ void dock_shutdown(gboolean reconfig)
     RrAppearanceFree(dock->a_frame);
     window_remove(dock->frame);
     stacking_remove(dock);
+    g_slice_free(ObDock, dock);
+    dock = NULL;
 }
 
 void dock_manage(Window icon_win, Window name_win)
@@ -137,7 +139,7 @@ void dock_manage(Window icon_win, Window name_win)
     XWindowAttributes attrib;
     gchar **data;
 
-    app = g_new0(ObDockApp, 1);
+    app = g_slice_new0(ObDockApp);
     app->name_win = name_win;
     app->icon_win = icon_win;
 
@@ -224,7 +226,7 @@ void dock_unmanage(ObDockApp *app, gboolean reparent)
 
     g_free(app->name);
     g_free(app->class);
-    g_free(app);
+    g_slice_free(ObDockApp, app);
 }
 
 void dock_configure(void)
@@ -234,7 +236,7 @@ void dock_configure(void)
     gint gravity;
     gint l, r, t, b;
     gint strw, strh;
-    Rect *a;
+    const Rect *a;
     gint hidesize;
 
     RrMargins(dock->a_frame, &l, &t, &r, &b);
@@ -548,8 +550,6 @@ void dock_configure(void)
     }
 
     screen_update_areas();
-
-    g_free(a);
 }
 
 void dock_app_configure(ObDockApp *app, gint w, gint h)