diff --git a/ChangeLog b/ChangeLog
index ce76157f3b..957a1db992 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-15  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info):
+	Use g_filename_display_basename to calculate display name.
+
 2004-12-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ce76157f3b..957a1db992 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-12-15  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info):
+	Use g_filename_display_basename to calculate display name.
+
 2004-12-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ce76157f3b..957a1db992 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-12-15  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info):
+	Use g_filename_display_basename to calculate display name.
+
 2004-12-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ce76157f3b..957a1db992 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-12-15  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info):
+	Use g_filename_display_basename to calculate display name.
+
 2004-12-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates
diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
index 5d03a2ca78..b2407999e5 100644
--- a/gtk/gtkfilesystemunix.c
+++ b/gtk/gtkfilesystemunix.c
@@ -1743,9 +1743,7 @@ gtk_file_folder_unix_get_info (GtkFileFolder      *folder,
 
   if (types & GTK_FILE_INFO_DISPLAY_NAME)
     {
-      gchar *display_name = g_filename_to_utf8 (basename, -1, NULL, NULL, NULL);
-      if (!display_name)
-	display_name = g_strescape (basename, NULL);
+      gchar *display_name = g_filename_display_basename (filename);
 
       gtk_file_info_set_display_name (info, display_name);