diff --git a/ChangeLog b/ChangeLog
index 66251dad3b..574e2e6501 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 26 18:27:11 2001  Kristian Rietveld  <kristian@planet.nl>
+
+	* demos/gtk-demo/list_store.c (create_model): Anders
+	Carlsson suggested to use G_N_ELEMENTS here
+
 2001-10-26  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkbutton.[ch]
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 66251dad3b..574e2e6501 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Fri Oct 26 18:27:11 2001  Kristian Rietveld  <kristian@planet.nl>
+
+	* demos/gtk-demo/list_store.c (create_model): Anders
+	Carlsson suggested to use G_N_ELEMENTS here
+
 2001-10-26  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkbutton.[ch]
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 66251dad3b..574e2e6501 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Oct 26 18:27:11 2001  Kristian Rietveld  <kristian@planet.nl>
+
+	* demos/gtk-demo/list_store.c (create_model): Anders
+	Carlsson suggested to use G_N_ELEMENTS here
+
 2001-10-26  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkbutton.[ch]
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 66251dad3b..574e2e6501 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Fri Oct 26 18:27:11 2001  Kristian Rietveld  <kristian@planet.nl>
+
+	* demos/gtk-demo/list_store.c (create_model): Anders
+	Carlsson suggested to use G_N_ELEMENTS here
+
 2001-10-26  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkbutton.[ch]
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 66251dad3b..574e2e6501 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Oct 26 18:27:11 2001  Kristian Rietveld  <kristian@planet.nl>
+
+	* demos/gtk-demo/list_store.c (create_model): Anders
+	Carlsson suggested to use G_N_ELEMENTS here
+
 2001-10-26  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkbutton.[ch]
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 66251dad3b..574e2e6501 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Oct 26 18:27:11 2001  Kristian Rietveld  <kristian@planet.nl>
+
+	* demos/gtk-demo/list_store.c (create_model): Anders
+	Carlsson suggested to use G_N_ELEMENTS here
+
 2001-10-26  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkbutton.[ch]
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 66251dad3b..574e2e6501 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Oct 26 18:27:11 2001  Kristian Rietveld  <kristian@planet.nl>
+
+	* demos/gtk-demo/list_store.c (create_model): Anders
+	Carlsson suggested to use G_N_ELEMENTS here
+
 2001-10-26  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkbutton.[ch]
diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c
index 590289544b..b9daf6f056 100644
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -45,7 +45,6 @@ static Bug data[] =
   { TRUE,  50939, "Normal",     "Add shift clicking to GtkTextView" },
   { FALSE, 6112,  "Enhancement","netscape-like collapsable toolbars" },
   { FALSE, 1,     "Normal",     "First bug :=)" },
-  { 0, 0, NULL, NULL }
 };
 
 static GtkTreeModel *
@@ -63,7 +62,7 @@ create_model (void)
 			      G_TYPE_STRING);
 
   /* add data to the list store */
-  while (data[i].number)
+  for (i = 0; i < G_N_ELEMENTS (data); i++)
     {
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
@@ -72,7 +71,6 @@ create_model (void)
 			  COLUMN_SEVERITY, data[i].severity,
 			  COLUMN_DESCRIPTION, data[i].description,
 			  -1);
-      i++;
     }
 
   return GTK_TREE_MODEL (store);