diff --git a/ChangeLog b/ChangeLog
index f2f3d71e0..fe45ca0a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 30 22:04:31 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (gtk_toolbar_forall): Only include
+	placeholders when include_internals is TRUE.
+
 Thu Oct 30 17:57:53 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolbar.c (logical_to_physical): Make it work even when
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f2f3d71e0..fe45ca0a1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Oct 30 22:04:31 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (gtk_toolbar_forall): Only include
+	placeholders when include_internals is TRUE.
+
 Thu Oct 30 17:57:53 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolbar.c (logical_to_physical): Make it work even when
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f2f3d71e0..fe45ca0a1 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Oct 30 22:04:31 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (gtk_toolbar_forall): Only include
+	placeholders when include_internals is TRUE.
+
 Thu Oct 30 17:57:53 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolbar.c (logical_to_physical): Make it work even when
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f2f3d71e0..fe45ca0a1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Oct 30 22:04:31 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (gtk_toolbar_forall): Only include
+	placeholders when include_internals is TRUE.
+
 Thu Oct 30 17:57:53 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolbar.c (logical_to_physical): Make it work even when
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f2f3d71e0..fe45ca0a1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Oct 30 22:04:31 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (gtk_toolbar_forall): Only include
+	placeholders when include_internals is TRUE.
+
 Thu Oct 30 17:57:53 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolbar.c (logical_to_physical): Make it work even when
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index f6af3f869..f595963be 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -2099,8 +2099,9 @@ gtk_toolbar_forall (GtkContainer *container,
     {
       ToolbarContent *content = list->data;
       GList *next = list->next;
-      
-      (*callback) (GTK_WIDGET (content->item), callback_data);
+
+      if (!content->is_placeholder || include_internals)
+	(*callback) (GTK_WIDGET (content->item), callback_data);
       
       list = next;
     }