diff --git a/ChangeLog b/ChangeLog
index f4abc21a21..2090fde8df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystem.c: Remove C99-isms (#304879, 
+	Kazuki IWAMOTO)
+
 2005-05-18  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooser.c (gtk_file_chooser_remove_shortcut_folder_uri): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f4abc21a21..2090fde8df 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-05-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystem.c: Remove C99-isms (#304879, 
+	Kazuki IWAMOTO)
+
 2005-05-18  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooser.c (gtk_file_chooser_remove_shortcut_folder_uri): 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f4abc21a21..2090fde8df 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-05-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystem.c: Remove C99-isms (#304879, 
+	Kazuki IWAMOTO)
+
 2005-05-18  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooser.c (gtk_file_chooser_remove_shortcut_folder_uri): 
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index fa0560bcbd..620e1967e8 100644
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -787,10 +787,12 @@ gchar *
 gtk_file_system_get_bookmark_label (GtkFileSystem     *file_system,
 				    const GtkFilePath *path)
 {
+  GtkFileSystemIface *iface;
+
   g_return_val_if_fail (GTK_IS_FILE_SYSTEM (file_system), NULL);
   g_return_val_if_fail (path != NULL, FALSE);
 
-  GtkFileSystemIface *iface = GTK_FILE_SYSTEM_GET_IFACE (file_system);
+  iface = GTK_FILE_SYSTEM_GET_IFACE (file_system);
   if (iface->get_bookmark_label)
     return iface->get_bookmark_label (file_system, path);
 
@@ -813,10 +815,12 @@ gtk_file_system_set_bookmark_label (GtkFileSystem     *file_system,
 				    const GtkFilePath *path,
 				    const gchar       *label)
 {
+  GtkFileSystemIface *iface;
+
   g_return_if_fail (GTK_IS_FILE_SYSTEM (file_system));
   g_return_if_fail (path != NULL);
 
-  GtkFileSystemIface *iface = GTK_FILE_SYSTEM_GET_IFACE (file_system);
+  iface = GTK_FILE_SYSTEM_GET_IFACE (file_system);
   if (iface->set_bookmark_label)
     iface->set_bookmark_label (file_system, path, label);
 }