diff --git a/ChangeLog b/ChangeLog
index b2115050ec..614ed7cd2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-08  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/testfilechooserbutton.c (main): Disable the SAVE 
+	and CREATE_FOLDER modes.  (#157675, Christian Persch)
+
 	* gtk/gtkaboutdialog.c (gtk_about_dialog_set_website): Hide the
 	website button if the url is unset.  (#157630, John Finlay)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b2115050ec..614ed7cd2c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-11-08  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/testfilechooserbutton.c (main): Disable the SAVE 
+	and CREATE_FOLDER modes.  (#157675, Christian Persch)
+
 	* gtk/gtkaboutdialog.c (gtk_about_dialog_set_website): Hide the
 	website button if the url is unset.  (#157630, John Finlay)
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b2115050ec..614ed7cd2c 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-11-08  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/testfilechooserbutton.c (main): Disable the SAVE 
+	and CREATE_FOLDER modes.  (#157675, Christian Persch)
+
 	* gtk/gtkaboutdialog.c (gtk_about_dialog_set_website): Hide the
 	website button if the url is unset.  (#157630, John Finlay)
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b2115050ec..614ed7cd2c 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-11-08  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/testfilechooserbutton.c (main): Disable the SAVE 
+	and CREATE_FOLDER modes.  (#157675, Christian Persch)
+
 	* gtk/gtkaboutdialog.c (gtk_about_dialog_set_website): Hide the
 	website button if the url is unset.  (#157630, John Finlay)
 
diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c
index cbf3eaea87..0897aefbea 100644
--- a/tests/testfilechooserbutton.c
+++ b/tests/testfilechooserbutton.c
@@ -134,6 +134,7 @@ main (int argc, char *argv[])
   group_box = gtk_vbox_new (FALSE, 6);
   gtk_container_add (GTK_CONTAINER (alignment), group_box);
 
+  /* open mode */
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE, FALSE, 0);
 
@@ -155,6 +156,7 @@ main (int argc, char *argv[])
   g_signal_connect (button, "clicked", G_CALLBACK (properties_button_clicked_cb), chooser);
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
 
+  /* select folder mode */
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE, FALSE, 0);
 
@@ -177,6 +179,8 @@ main (int argc, char *argv[])
   g_signal_connect (button, "clicked", G_CALLBACK (properties_button_clicked_cb), chooser);
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
 
+#if 0
+  /* save mode */
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE, FALSE, 0);
 
@@ -199,6 +203,7 @@ main (int argc, char *argv[])
   g_signal_connect (button, "clicked", G_CALLBACK (properties_button_clicked_cb), chooser);
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
 
+  /* create folder mode */
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE, FALSE, 0);
 
@@ -220,6 +225,7 @@ main (int argc, char *argv[])
   button = gtk_button_new_with_label ("Properties...");
   g_signal_connect (button, "clicked", G_CALLBACK (properties_button_clicked_cb), chooser);
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+#endif
 
   g_object_unref (label_group);