use g_slic_* for all object allocations.

Thu Dec  1 12:53:26 2005  Tim Janik  <timj@imendio.com>

        * gtype.c: use g_slic_* for all object allocations.

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 1dd51cc..d8e4555 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec  1 12:53:26 2005  Tim Janik  <timj@imendio.com>
+
+       * gtype.c: use g_slic_* for all object allocations.
+
 2005-11-28  Matthias Clasen  <mclasen@redhat.com>
 
        * gobjectnotifyqueue.c (g_object_notify_queue_thaw): 

diff --git a/gobject/gtype.c b/gobject/gtype.c
index 3d312b2..95518f1 100644 (file)
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -1544,10 +1544,7 @@ g_type_create_instance (GType type)
   class = g_type_class_ref (type);
   total_size = type_total_instance_size_I (node);
 
-  if (node->data->instance.n_preallocs)
-    instance = g_slice_alloc0 (total_size);
-  else
-    instance = g_malloc0 (total_size);
+  instance = g_slice_alloc0 (total_size);
 
   if (node->data->instance.private_size)
     instance_real_class_set (instance, class);
@@ -1600,10 +1597,7 @@ g_type_free_instance (GTypeInstance *instance)
 #ifdef G_ENABLE_DEBUG  
   memset (instance, 0xaa, type_total_instance_size_I (node));
 #endif
-  if (node->data->instance.n_preallocs)
-    g_slice_free1 (type_total_instance_size_I (node), instance);
-  else
-    g_free (instance);
+  g_slice_free1 (type_total_instance_size_I (node), instance);
 
   g_type_class_unref (class);
 }