diff options
Diffstat (limited to 'ui/gtk/main_statusbar.c')
-rw-r--r-- | ui/gtk/main_statusbar.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index fe3dc074db..d7efa82a42 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -738,7 +738,7 @@ statusbar_cf_file_closed_cb(capture_file *cf _U_) static void -statusbar_cf_file_read_started_cb(capture_file *cf) +statusbar_cf_file_read_started_cb(capture_file *cf, const char *action) { const gchar *name_ptr; @@ -747,7 +747,7 @@ statusbar_cf_file_read_started_cb(capture_file *cf) name_ptr = get_basename(cf->filename); - statusbar_push_file_msg(" Loading: %s", name_ptr); + statusbar_push_file_msg(" %s: %s", action, name_ptr); } @@ -937,14 +937,6 @@ statusbar_cf_file_save_finished_cb(gpointer data _U_) } static void -statusbar_cf_file_reload_finished_cb(capture_file *cf) -{ - statusbar_pop_file_msg(); - statusbar_set_filename(cf->filename, cf->f_datalen, &(cf->elapsed_time)); -} - - -static void statusbar_cf_file_save_failed_cb(gpointer data _U_) { /* Pop the "Saving:" message off the status bar. */ @@ -964,11 +956,17 @@ statusbar_cf_callback(gint event, gpointer data, gpointer user_data _U_) statusbar_cf_file_closed_cb(data); break; case(cf_cb_file_read_started): - statusbar_cf_file_read_started_cb(data); + statusbar_cf_file_read_started_cb(data, "Loading"); break; case(cf_cb_file_read_finished): statusbar_cf_file_read_finished_cb(data); break; + case(cf_cb_file_reload_started): + statusbar_cf_file_read_started_cb(data, "Reloading"); + break; + case(cf_cb_file_reload_finished): + statusbar_cf_file_read_finished_cb(data); + break; case(cf_cb_packet_selected): break; case(cf_cb_packet_unselected): @@ -982,9 +980,6 @@ statusbar_cf_callback(gint event, gpointer data, gpointer user_data _U_) case(cf_cb_file_save_finished): statusbar_cf_file_save_finished_cb(data); break; - case(cf_cb_file_save_reload_finished): - statusbar_cf_file_reload_finished_cb(data); - break; case(cf_cb_file_save_failed): statusbar_cf_file_save_failed_cb(data); break; |