diff options
| -rw-r--r-- | file.c | 4 | ||||
| -rw-r--r-- | ui/gtk/capture_file_dlg.c | 2 | ||||
| -rw-r--r-- | ui/gtk/main_statusbar.c | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -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)"; } diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c index 18437b53f0..04a7cda96f 100644 --- a/ui/gtk/capture_file_dlg.c +++ b/ui/gtk/capture_file_dlg.c @@ -173,7 +173,7 @@ preview_set_filename(GtkWidget *prev, const gchar *cf_name) } label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FILENAME_KEY); - gtk_label_set_text(GTK_LABEL(label), get_basename(cf_name)); + gtk_label_set_text(GTK_LABEL(label), g_filename_display_basename(cf_name)); if (test_for_directory(cf_name) == EISDIR) { label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY); diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index d7efa82a42..b7797d9ffa 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -745,7 +745,7 @@ statusbar_cf_file_read_started_cb(capture_file *cf, const char *action) /* Ensure we pop any previous loaded filename */ statusbar_pop_file_msg(); - name_ptr = get_basename(cf->filename); + name_ptr = g_filename_display_basename(cf->filename); statusbar_push_file_msg(" %s: %s", action, name_ptr); } @@ -926,7 +926,7 @@ static void statusbar_cf_file_save_started_cb(gchar *filename) { statusbar_pop_file_msg(); - statusbar_push_file_msg(" Saving: %s...", get_basename(filename)); + statusbar_push_file_msg(" Saving: %s...", g_filename_display_basename(filename)); } static void |