Merge branch 'master' into chaz

[chaz/openbox] / obrender / instance.c

diff --git a/obrender/instance.c b/obrender/instance.c
index b867815c31c5096b44b9b7a6b2470fef8a6402f6..e1049388f9340386a2251a48687cc9e3ddbcbc23 100644 (file)
--- a/obrender/instance.c
+++ b/obrender/instance.c
@@ -57,9 +57,7 @@ void print_refs(gint id)
 
 RrInstance* RrInstanceNew (Display *display, gint screen)
 {
-    g_type_init(); /* supposedly needed for pango but seems to work without */
-
-    definst = g_new (RrInstance, 1);
+    definst = g_slice_new(RrInstance);
     definst->display = display;
     definst->screen = screen;
 
@@ -214,7 +212,7 @@ void RrInstanceFree (RrInstance *inst)
         g_free(inst->pseudo_colors);
         g_hash_table_destroy(inst->color_hash);
         g_object_unref(inst->pango);
-        g_free(inst);
+        g_slice_free(RrInstance, inst);
     }
 }