Use g_filename_display_basename() rather than get_basename() when we're

getting the basename for display purposes, so it's converted from the
GLib/GTK+ locale filename encoding to UTF-8.  (For Windows, the locale
filename encoding is UTF-8, and the internal encoding is UTF-16, so the
file names should *probably* all be valid UTF-8 - Windows may not
support invalid UTF-16 in file names.  For Qt, I'm not sure whether the
file dialogs ever return file names in some non-UTF-8 encoding.)

svn path=/trunk/; revision=43044

1 files changed, 2 insertions, 2 deletions

diff --git a/file.c b/file.c
index 4b0c5a114f..ddc441879d 100644
--- a/file.c
+++ b/file.c
@@ -523,7 +523,7 @@ cf_read(capture_file *cf, gboolean reloading)
 
   reset_tap_listeners();
 
-  name_ptr = get_basename(cf->filename);
+  name_ptr = g_filename_display_basename(cf->filename);
 
   if (reloading)
     cf_callback_invoke(cf_cb_file_reload_started, cf);
@@ -978,7 +978,7 @@ cf_get_display_name(capture_file *cf)
   if (!cf->is_tempfile) {
     /* Get the last component of the file name, and use that. */
     if (cf->filename){
-      displayname = get_basename(cf->filename);
+      displayname = g_filename_display_basename(cf->filename);
     } else {
       displayname="(No file)";
     }