URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=05fbb4826bcb182cc3895874a15585a96703ce1f
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
05fbb48 by Gerald Combs (gerald@xxxxxxxxxxxxx):
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@xxxxxxxxxxxxx>
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 317649f reassemble: add cleanup routine.
adds 05fbb48 Qt: Show merge progress.
Summary of changes:
file.c | 17 ++++++++++++-----
file.h | 9 ++++++---
ui/gtk/capture_file_dlg.c | 6 +++---
ui/gtk/drag_and_drop.c | 2 +-
ui/gtk/main_statusbar.c | 4 ++++
ui/qt/capture_file.cpp | 8 ++++++++
ui/qt/capture_file.h | 2 ++
ui/qt/main_window.cpp | 10 +++++++---
ui/qt/main_window.h | 2 ++
ui/qt/main_window_slots.cpp | 13 +++++++++++++
10 files changed, 58 insertions(+), 15 deletions(-)