Don't leak child_anchor_table. (#84425)

	* gtk/gtktextbtree.c (_gtk_text_btree_unref): Don't leak
	child_anchor_table.  (#84425)

	* gtk/gtktextlayout.c (gtk_text_layout_finalize): Don't leak
	one_display_cache.  (#84424)

8 files changed, 60 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index a3b8cde20..eabe21b62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-09  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextbtree.c (_gtk_text_btree_unref): Don't leak
+	child_anchor_table.  (#84425)
+
+	* gtk/gtktextlayout.c (gtk_text_layout_finalize): Don't leak
+	one_display_cache.  (#84424)
+
 Fri Jun  7 23:11:42 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): Fix sizing
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a3b8cde20..eabe21b62 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2002-06-09  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextbtree.c (_gtk_text_btree_unref): Don't leak
+	child_anchor_table.  (#84425)
+
+	* gtk/gtktextlayout.c (gtk_text_layout_finalize): Don't leak
+	one_display_cache.  (#84424)
+
 Fri Jun  7 23:11:42 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): Fix sizing
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a3b8cde20..eabe21b62 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2002-06-09  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextbtree.c (_gtk_text_btree_unref): Don't leak
+	child_anchor_table.  (#84425)
+
+	* gtk/gtktextlayout.c (gtk_text_layout_finalize): Don't leak
+	one_display_cache.  (#84424)
+
 Fri Jun  7 23:11:42 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): Fix sizing
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a3b8cde20..eabe21b62 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2002-06-09  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextbtree.c (_gtk_text_btree_unref): Don't leak
+	child_anchor_table.  (#84425)
+
+	* gtk/gtktextlayout.c (gtk_text_layout_finalize): Don't leak
+	one_display_cache.  (#84424)
+
 Fri Jun  7 23:11:42 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): Fix sizing
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a3b8cde20..eabe21b62 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2002-06-09  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextbtree.c (_gtk_text_btree_unref): Don't leak
+	child_anchor_table.  (#84425)
+
+	* gtk/gtktextlayout.c (gtk_text_layout_finalize): Don't leak
+	one_display_cache.  (#84424)
+
 Fri Jun  7 23:11:42 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): Fix sizing
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a3b8cde20..eabe21b62 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2002-06-09  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextbtree.c (_gtk_text_btree_unref): Don't leak
+	child_anchor_table.  (#84425)
+
+	* gtk/gtktextlayout.c (gtk_text_layout_finalize): Don't leak
+	one_display_cache.  (#84424)
+
 Fri Jun  7 23:11:42 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): Fix sizing
diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index 30c66e4a7..e0ab392a3 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -511,6 +511,11 @@ _gtk_text_btree_unref (GtkTextBTree *tree)
       g_assert (g_hash_table_size (tree->mark_table) == 0);
       g_hash_table_destroy (tree->mark_table);
       tree->mark_table = NULL;
+      if (tree->child_anchor_table != NULL) 
+	{
+	  g_hash_table_destroy (tree->child_anchor_table);
+	  tree->child_anchor_table = NULL;
+	}
       
       g_object_unref (G_OBJECT (tree->insert_mark));
       tree->insert_mark = NULL;
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index e414bf975..bb76ae080 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -254,6 +254,13 @@ gtk_text_layout_finalize (GObject *object)
       layout->rtl_context = NULL;
     }
   
+  if (layout->one_display_cache) 
+    {
+      GtkTextLineDisplay *tmp_display = layout->one_display_cache;
+      layout->one_display_cache = NULL;
+      gtk_text_layout_free_line_display (layout, tmp_display);
+    }
+
   (* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }