From 05fbb4826bcb182cc3895874a15585a96703ce1f Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 20 Jan 2017 16:05:56 -0800 Subject: 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 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- ui/gtk/main_statusbar.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ui/gtk/main_statusbar.c') diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index 1cb241a294..53a36c7a16 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -1038,6 +1038,10 @@ statusbar_cf_callback(gint event, gpointer data, gpointer user_data _U_) break; case(cf_cb_file_retap_finished): break; + case(cf_cb_file_merge_started): + break; + case(cf_cb_file_merge_finished): + break; case(cf_cb_file_fast_save_finished): break; case(cf_cb_packet_selected): -- cgit v1.2.3