diff --git a/ChangeLog b/ChangeLog
index 33c2271cdc..becb104fe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-12-23  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkliststore.c (gtk_list_store_iter_children): 
+	Return TRUE if there are children.  (#162134, Iñigo Serna,
+	patch by John Finlay)
+
 	* gtk/gtkcombobox.c (gtk_combo_box_button_state_changed): 
 	Transfer state from the button to the cell view to get
 	prelighting right.  (#156327, Ricardo Veguilla)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 33c2271cdc..becb104fe5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2004-12-23  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkliststore.c (gtk_list_store_iter_children): 
+	Return TRUE if there are children.  (#162134, Iñigo Serna,
+	patch by John Finlay)
+
 	* gtk/gtkcombobox.c (gtk_combo_box_button_state_changed): 
 	Transfer state from the button to the cell view to get
 	prelighting right.  (#156327, Ricardo Veguilla)
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 33c2271cdc..becb104fe5 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
 2004-12-23  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkliststore.c (gtk_list_store_iter_children): 
+	Return TRUE if there are children.  (#162134, Iñigo Serna,
+	patch by John Finlay)
+
 	* gtk/gtkcombobox.c (gtk_combo_box_button_state_changed): 
 	Transfer state from the button to the cell view to get
 	prelighting right.  (#156327, Ricardo Veguilla)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 33c2271cdc..becb104fe5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2004-12-23  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkliststore.c (gtk_list_store_iter_children): 
+	Return TRUE if there are children.  (#162134, Iñigo Serna,
+	patch by John Finlay)
+
 	* gtk/gtkcombobox.c (gtk_combo_box_button_state_changed): 
 	Transfer state from the button to the cell view to get
 	prelighting right.  (#156327, Ricardo Veguilla)
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index f05a1f2f7c..6149225569 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -576,7 +576,7 @@ gtk_list_store_iter_children (GtkTreeModel *tree_model,
 
   list_store = GTK_LIST_STORE (tree_model);
 
-  if (_gtk_sequence_get_length (list_store->seq) == 0)
+  if (_gtk_sequence_get_length (list_store->seq) > 0)
     {
       iter->stamp = list_store->stamp;
       iter->user_data = _gtk_sequence_get_begin_ptr (list_store->seq);