diff --git a/ChangeLog b/ChangeLog
index 49a81ef3f1..3e0bc047e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-19  jacob berkman  <jacob@ximian.com>
+
+	* gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when
+	gtk_combo_func() returns NULL (bug #75464)
+
 2002-03-18  jacob berkman  <jacob@ximian.com>
 
 	* gtk/gtkaspectframe.c (gtk_aspect_frame_class_init): set the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 49a81ef3f1..3e0bc047e3 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-03-19  jacob berkman  <jacob@ximian.com>
+
+	* gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when
+	gtk_combo_func() returns NULL (bug #75464)
+
 2002-03-18  jacob berkman  <jacob@ximian.com>
 
 	* gtk/gtkaspectframe.c (gtk_aspect_frame_class_init): set the
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 49a81ef3f1..3e0bc047e3 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-03-19  jacob berkman  <jacob@ximian.com>
+
+	* gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when
+	gtk_combo_func() returns NULL (bug #75464)
+
 2002-03-18  jacob berkman  <jacob@ximian.com>
 
 	* gtk/gtkaspectframe.c (gtk_aspect_frame_class_init): set the
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 49a81ef3f1..3e0bc047e3 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-03-19  jacob berkman  <jacob@ximian.com>
+
+	* gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when
+	gtk_combo_func() returns NULL (bug #75464)
+
 2002-03-18  jacob berkman  <jacob@ximian.com>
 
 	* gtk/gtkaspectframe.c (gtk_aspect_frame_class_init): set the
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 49a81ef3f1..3e0bc047e3 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-03-19  jacob berkman  <jacob@ximian.com>
+
+	* gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when
+	gtk_combo_func() returns NULL (bug #75464)
+
 2002-03-18  jacob berkman  <jacob@ximian.com>
 
 	* gtk/gtkaspectframe.c (gtk_aspect_frame_class_init): set the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 49a81ef3f1..3e0bc047e3 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-03-19  jacob berkman  <jacob@ximian.com>
+
+	* gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when
+	gtk_combo_func() returns NULL (bug #75464)
+
 2002-03-18  jacob berkman  <jacob@ximian.com>
 
 	* gtk/gtkaspectframe.c (gtk_aspect_frame_class_init): set the
diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index 9fcbf8f55a..434941cd71 100644
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -319,9 +319,9 @@ gtk_combo_find (GtkCombo * combo)
   else
     compare_text = g_utf8_casefold (text, -1);
   
-  clist = GTK_LIST (combo->list)->children;
-
-  while (!found && clist && clist->data)
+  for (clist = GTK_LIST (combo->list)->children;
+       !found && clist;
+       clist = clist->next)
     {
       ltext = gtk_combo_func (GTK_LIST_ITEM (clist->data));
       if (!ltext)
@@ -335,8 +335,6 @@ gtk_combo_find (GtkCombo * combo)
 
       if (!combo->case_sensitive)
 	g_free (ltext);
-
-      clist = clist->next;
     }
 
   if (!combo->case_sensitive)