Make tests work with slice allocator

diff --git a/ChangeLog b/ChangeLog
index 0d4562b..2cd4f35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-2005-12-01 Matthias Clasen <mclasen@redhat.com>
+2005-12-01  Matthias Clasen  <mclasen@redhat.com>
+
+       * tests/gobject/ifacecheck.c (test_iface_base_init): Don't
+       double-free base interface members.
 
        * tests/Makefile.am: Remove duplicate variable.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0d4562b..2cd4f35 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,7 @@
-2005-12-01 Matthias Clasen <mclasen@redhat.com>
+2005-12-01  Matthias Clasen  <mclasen@redhat.com>
+
+       * tests/gobject/ifacecheck.c (test_iface_base_init): Don't
+       double-free base interface members.
 
        * tests/Makefile.am: Remove duplicate variable.
 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 0d4562b..2cd4f35 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,4 +1,7 @@
-2005-12-01 Matthias Clasen <mclasen@redhat.com>
+2005-12-01  Matthias Clasen  <mclasen@redhat.com>
+
+       * tests/gobject/ifacecheck.c (test_iface_base_init): Don't
+       double-free base interface members.
 
        * tests/Makefile.am: Remove duplicate variable.
 

diff --git a/tests/gobject/ifacecheck.c b/tests/gobject/ifacecheck.c
index 4572deb..f57189a 100644 (file)
--- a/tests/gobject/ifacecheck.c
+++ b/tests/gobject/ifacecheck.c
@@ -47,9 +47,7 @@ struct _TestIfaceClass
 static void
 test_iface_base_init (TestIfaceClass *iface)
 {
-  if (iface->history)
-    g_string_free (iface->history, TRUE);
-  iface->history = g_string_new (NULL);
+  iface->history = g_string_new (iface->history ? iface->history->str : NULL);
 }
 
 static DEFINE_IFACE(TestIface, test_iface, test_iface_base_init, NULL)