diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-01-20 16:05:56 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-01-21 06:50:30 +0000 |
| commit | 05fbb4826bcb182cc3895874a15585a96703ce1f (patch) | |
| tree | 448763b393a9ba79c49df7d98c94a77a9e05849d /file.h | |
| parent | 317649f94984cf3d17f2a57badebb78d7703cdb5 (diff) | |
Qt: Show merge progress.
Add "file merge" callback plumbing. Use it to display "Merging files" in
the main statusbar.
Make sure we have a usable window pointer when we merge files.
Change-Id: I236b6edb30685f0b06703ab8304bc88ae592f83c
Reviewed-on: https://code.wireshark.org/review/19716
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'file.h')
| -rw-r--r-- | file.h | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -73,6 +73,8 @@ typedef enum { cf_cb_file_rescan_finished, cf_cb_file_retap_started, cf_cb_file_retap_finished, + cf_cb_file_merge_started, /* Qt only */ + cf_cb_file_merge_finished, /* Qt only */ cf_cb_file_fast_save_finished, /* GTK+ only? */ cf_cb_packet_selected, /* GTK+ only. */ cf_cb_packet_unselected, /* GTK+ only. */ @@ -634,6 +636,7 @@ void cf_unignore_frame(capture_file *cf, frame_data *frame); * Merge two or more capture files into a temporary file. * @todo is this the right place for this function? It doesn't have to do a lot with capture_file. * + * @param pd_window Window pointer suitable for use by delayed_create_progress_dlg. * @param out_filenamep Points to a pointer that's set to point to the * pathname of the temporary file; it's allocated with g_malloc() * @param in_file_count the number of input files to merge @@ -643,9 +646,9 @@ void cf_unignore_frame(capture_file *cf, frame_data *frame); * @return one of cf_status_t */ cf_status_t -cf_merge_files_to_tempfile(char **out_filenamep, int in_file_count, - char *const *in_filenames, int file_type, - gboolean do_append); +cf_merge_files_to_tempfile(gpointer pd_window, char **out_filenamep, + int in_file_count, char *const *in_filenames, + int file_type, gboolean do_append); /** |