Remove duplicate status messages.

Adding back progress titles in g3069129fe5 revealed the fact that we had
duplicate messages in the Qt UI and in file.c. Remove the ones in file.c
in favor of the Qt UI, since the latter are translated.

Change-Id: I5ff8f1bd34e963e9e66c01420ad8c5fe9c2f0caa
Reviewed-on: https://code.wireshark.org/review/36646
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 7 insertions, 9 deletions

diff --git a/file.c b/file.c
index 2b10dc7e5c..4037e94b39 100644
--- a/file.c
+++ b/file.c
@@ -586,10 +586,10 @@ cf_read(capture_file *cf, gboolean reloading)
         if (progress_is_slow(progbar, prog_timer, size, file_pos)) {
           progbar_val = calc_progbar_val(cf, size, file_pos, status_str, sizeof(status_str));
           if (reloading)
-            progbar = delayed_create_progress_dlg(cf->window, "Reloading", name_ptr,
+            progbar = delayed_create_progress_dlg(cf->window, NULL, NULL,
                 TRUE, &cf->stop_flag, progbar_val);
           else
-            progbar = delayed_create_progress_dlg(cf->window, "Loading", name_ptr,
+            progbar = delayed_create_progress_dlg(cf->window, NULL, NULL,
                 TRUE, &cf->stop_flag, progbar_val);
         }
 
@@ -716,7 +716,7 @@ cf_read(capture_file *cf, gboolean reloading)
   if (cf->redissection_queued != RESCAN_NONE) {
     /* Redissection was queued up. Clear the request and perform it now. */
     gboolean redissect = cf->redissection_queued == RESCAN_REDISSECT;
-    rescan_packets(cf, "Reprocessing", "all packets", redissect);
+    rescan_packets(cf, NULL, NULL, redissect);
   }
 
   if (cf->stop_flag) {
@@ -1319,7 +1319,7 @@ merge_callback(merge_event event, int num _U_,
            large file, we might take considerably longer than that standard
            time in order to get to the next progress bar step). */
         if (cb_data->progbar == NULL) {
-          cb_data->progbar = delayed_create_progress_dlg(cb_data->pd_window, "Merging", "files",
+          cb_data->progbar = delayed_create_progress_dlg(cb_data->pd_window, NULL, NULL,
             FALSE, &cb_data->stop_flag, 0.0f);
         }
 
@@ -1509,7 +1509,7 @@ cf_filter_packets(capture_file *cf, gchar *dftext, gboolean force)
       cf->redissection_queued = RESCAN_SCAN;
     } else if (cf->state != FILE_CLOSED) {
       if (dftext == NULL) {
-        rescan_packets(cf, "Resetting", "Filter", FALSE);
+        rescan_packets(cf, "Resetting", "filter", FALSE);
       } else {
         rescan_packets(cf, "Filtering", dftext, FALSE);
       }
@@ -3588,7 +3588,6 @@ find_packet(capture_file *cf, ws_match_function match_function,
   gboolean     succeeded;
   float        progbar_val;
   gchar        status_str[100];
-  const char  *title;
   match_result result;
 
   wtap_rec_init(&rec);
@@ -3613,7 +3612,6 @@ find_packet(capture_file *cf, ws_match_function match_function,
 
   cf->stop_flag = FALSE;
 
-  title = cf->sfilter?cf->sfilter:"";
   for (;;) {
     /* Create the progress bar if necessary.
        We check on every iteration of the loop, so that it takes no
@@ -3621,7 +3619,7 @@ find_packet(capture_file *cf, ws_match_function match_function,
          large file, we might take considerably longer than that standard
        time in order to get to the next progress bar step). */
     if (progbar == NULL)
-       progbar = delayed_create_progress_dlg(cf->window, "Searching", title,
+       progbar = delayed_create_progress_dlg(cf->window, NULL, NULL,
          FALSE, &cf->stop_flag, progbar_val);
 
     /*
@@ -4325,7 +4323,7 @@ rescan_file(capture_file *cf, const char *fname, gboolean is_tempfile)
       /* Create the progress bar if necessary. */
       if (progress_is_slow(progbar, prog_timer, size, cf->f_datalen)) {
         progbar_val = calc_progbar_val(cf, size, cf->f_datalen, status_str, sizeof(status_str));
-        progbar = delayed_create_progress_dlg(cf->window, "Rescanning", name_ptr,
+        progbar = delayed_create_progress_dlg(cf->window, NULL, NULL,
                                               TRUE, &cf->stop_flag, progbar_val);
       }