diff --git a/ChangeLog b/ChangeLog
index 7a3899ce1a..a30ec5d1de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 14 00:05:18 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktreemodelfilter.c (bsearch_elt_with_offset): 
+	Use do instead of while.  (#134031, Morten Welinder);
+
 Sat Feb 14 00:00:52 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Suppress xsltproc and xmlcatalog checks
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7a3899ce1a..a30ec5d1de 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Feb 14 00:05:18 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktreemodelfilter.c (bsearch_elt_with_offset): 
+	Use do instead of while.  (#134031, Morten Welinder);
+
 Sat Feb 14 00:00:52 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Suppress xsltproc and xmlcatalog checks
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7a3899ce1a..a30ec5d1de 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Feb 14 00:05:18 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktreemodelfilter.c (bsearch_elt_with_offset): 
+	Use do instead of while.  (#134031, Morten Welinder);
+
 Sat Feb 14 00:00:52 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Suppress xsltproc and xmlcatalog checks
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7a3899ce1a..a30ec5d1de 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Feb 14 00:05:18 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktreemodelfilter.c (bsearch_elt_with_offset): 
+	Use do instead of while.  (#134031, Morten Welinder);
+
 Sat Feb 14 00:00:52 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Suppress xsltproc and xmlcatalog checks
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7a3899ce1a..a30ec5d1de 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Feb 14 00:05:18 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktreemodelfilter.c (bsearch_elt_with_offset): 
+	Use do instead of while.  (#134031, Morten Welinder);
+
 Sat Feb 14 00:00:52 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Suppress xsltproc and xmlcatalog checks
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 691e7afe8d..b6934c90b0 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -992,7 +992,7 @@ bsearch_elt_with_offset (GArray *array,
         return NULL;
     }
 
-  while (start != end)
+  do
     {
       middle = (start + end) / 2;
 
@@ -1005,6 +1005,7 @@ bsearch_elt_with_offset (GArray *array,
       else
         break;
     }
+  while (start != end);
 
   if (elt->offset == offset)
     {