diff --git a/ChangeLog b/ChangeLog
index dfc8cd221..3f9543056 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextbtree.c (_gtk_text_btree_char_is_invisible): Small 
+	cleanup.  (#305539, Paolo Borelli)
+
 2005-06-09  Rodrigo Moya <rodrigo@novell.com>
 
 	* configure.in: added cairo to list of $GTK_PACKAGES.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index dfc8cd221..3f9543056 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-06-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextbtree.c (_gtk_text_btree_char_is_invisible): Small 
+	cleanup.  (#305539, Paolo Borelli)
+
 2005-06-09  Rodrigo Moya <rodrigo@novell.com>
 
 	* configure.in: added cairo to list of $GTK_PACKAGES.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index dfc8cd221..3f9543056 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-06-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextbtree.c (_gtk_text_btree_char_is_invisible): Small 
+	cleanup.  (#305539, Paolo Borelli)
+
 2005-06-09  Rodrigo Moya <rodrigo@novell.com>
 
 	* configure.in: added cairo to list of $GTK_PACKAGES.
diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index 050399e5f..5ebfcf80d 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -2434,7 +2434,7 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
 {
   gboolean invisible = FALSE;  /* if nobody says otherwise, it's visible */
 
-  int deftagCnts[LOTSA_TAGS];
+  int deftagCnts[LOTSA_TAGS] = { 0, };
   int *tagCnts = deftagCnts;
   GtkTextTag *deftags[LOTSA_TAGS];
   GtkTextTag **tags = deftags;
@@ -2457,15 +2457,10 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
   /* almost always avoid malloc, so stay out of system calls */
   if (LOTSA_TAGS < numTags)
     {
-      tagCnts = g_new (int, numTags);
+      tagCnts = g_new0 (int, numTags);
       tags = g_new (GtkTextTag*, numTags);
     }
 
-  for (i=0; i<numTags; i++)
-    {
-      tagCnts[i] = 0;
-    }
-
   /*
    * Record tag toggles within the line of indexPtr but preceding
    * indexPtr.