From 7efd9fe3c80ed821c182b7ab9a033cb615090dce Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 7 Nov 2005 15:36:21 +0000 Subject: [PATCH] We need to set n_preallocs to a nonzero value, otherwise GTK+ 2.8 breaks 2005-11-07 Matthias Clasen * glib/gmem.c (g_allocator_new): We need to set n_preallocs to a nonzero value, otherwise GTK+ 2.8 breaks when compiled against GLib 2.9. (#320755, Luca Ferretti) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ glib/gmem.c | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 34014fd..3b760b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-11-07 Matthias Clasen + + * glib/gmem.c (g_allocator_new): We need to set n_preallocs to a + nonzero value, otherwise GTK+ 2.8 breaks when compiled against + GLib 2.9. (#320755, Luca Ferretti) + 2005-11-04 Matthias Clasen * glib/Makefile.am: Apply a patch from Behdad Esfahbod to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 34014fd..3b760b0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-11-07 Matthias Clasen + + * glib/gmem.c (g_allocator_new): We need to set n_preallocs to a + nonzero value, otherwise GTK+ 2.8 breaks when compiled against + GLib 2.9. (#320755, Luca Ferretti) + 2005-11-04 Matthias Clasen * glib/Makefile.am: Apply a patch from Behdad Esfahbod to diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 34014fd..3b760b0 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2005-11-07 Matthias Clasen + + * glib/gmem.c (g_allocator_new): We need to set n_preallocs to a + nonzero value, otherwise GTK+ 2.8 breaks when compiled against + GLib 2.9. (#320755, Luca Ferretti) + 2005-11-04 Matthias Clasen * glib/Makefile.am: Apply a patch from Behdad Esfahbod to diff --git a/glib/gmem.c b/glib/gmem.c index 44873f8..3762965 100644 --- a/glib/gmem.c +++ b/glib/gmem.c @@ -1279,7 +1279,7 @@ g_allocator_new (const gchar *name, GMemChunk *mem_chunk; gpointer free_list; } dummy = { - "GAllocator is deprecated", 0, TRUE, 0, NULL, NULL, NULL, + "GAllocator is deprecated", 1, TRUE, 0, NULL, NULL, NULL, }; /* some (broken) GAllocator uses depend on non-NULL allocators */ return (GAllocator*) &dummy; -- 2.7.4