diff --git a/ChangeLog b/ChangeLog
index cabdbe2a3a..b8c84fe0d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 30 17:40:26 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (logical_to_physical): Make it work for
+	logical == 0.
+
 Thu Oct 30 16:20:58 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolbar.c (logical_to_physical): Make sure we actually
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cabdbe2a3a..b8c84fe0d6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Oct 30 17:40:26 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (logical_to_physical): Make it work for
+	logical == 0.
+
 Thu Oct 30 16:20:58 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolbar.c (logical_to_physical): Make sure we actually
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index cabdbe2a3a..b8c84fe0d6 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Oct 30 17:40:26 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (logical_to_physical): Make it work for
+	logical == 0.
+
 Thu Oct 30 16:20:58 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolbar.c (logical_to_physical): Make sure we actually
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cabdbe2a3a..b8c84fe0d6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Oct 30 17:40:26 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (logical_to_physical): Make it work for
+	logical == 0.
+
 Thu Oct 30 16:20:58 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolbar.c (logical_to_physical): Make sure we actually
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cabdbe2a3a..b8c84fe0d6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Oct 30 17:40:26 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (logical_to_physical): Make it work for
+	logical == 0.
+
 Thu Oct 30 16:20:58 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolbar.c (logical_to_physical): Make sure we actually
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 3de4327605..9095d2ed1e 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -1797,7 +1797,7 @@ logical_to_physical (GtkToolbar *toolbar, gint logical)
   g_assert (logical >= 0);
   
   physical = 0;
-  for (list = priv->content; list; list = list->next)
+  for (list = priv->content; list && logical > 0; list = list->next)
     {
       ToolbarContent *content = list->data;