URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=444dfda793784cecda0757cbe50e27a5ba855ba0
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
444dfda by Michael Mann (mmann78@xxxxxxxxxxxx):
Allow "capture info data" to not be a singleton.
It was buried as a static variable in capture_info.c, and functions were refactored to allow a pointer to the info_data_t structure to be passed in. TShark and GTK will have their own single (global) copy of the structure, while it opens up Qt to have multiple instances.
Change-Id: Ic2d7a2ad574de43f457cb18b194d6bc3fffb6120
Reviewed-on: https://code.wireshark.org/review/12691
Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
Actions performed:
from 7baac67 Qt: Try to fix Main Welcome Interfaces List Scrollbar
adds 444dfda Allow "capture info data" to not be a singleton.
Summary of changes:
capchild/capture_session.h | 3 +-
capchild/capture_sync.c | 3 +-
capchild/capture_sync.h | 4 +-
capture_info.c | 88 ++++++++++++++++++-------------------------
capture_info.h | 34 ++++++++++-------
tshark.c | 4 +-
ui/capture.c | 14 +++----
ui/capture.h | 3 +-
ui/capture_globals.h | 4 +-
ui/gtk/capture_dlg.c | 2 +-
ui/gtk/gtkglobals.h | 7 ++++
ui/gtk/main.c | 5 ++-
ui/qt/main_window.h | 2 +
ui/qt/main_window_slots.cpp | 2 +-
wireshark-qt.cpp | 2 +-
15 files changed, 92 insertions(+), 85 deletions(-)