diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-16 23:15:03 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-19 14:22:56 +0000 |
| commit | 444dfda793784cecda0757cbe50e27a5ba855ba0 (patch) | |
| tree | ec34e5780c2dbe29bc2f170c2fc406ee20aa0430 /ui/gtk/gtkglobals.h | |
| parent | 7baac67149a68b66087c5d688dbeda2869485765 (diff) | |
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@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/gtk/gtkglobals.h')
| -rw-r--r-- | ui/gtk/gtkglobals.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/gtk/gtkglobals.h b/ui/gtk/gtkglobals.h index 628685b6fb..e2fac873d7 100644 --- a/ui/gtk/gtkglobals.h +++ b/ui/gtk/gtkglobals.h @@ -37,6 +37,9 @@ * GTK global definitions. For example a pointer to the main application window. */ +#include <capchild/capture_session.h> +#include <capture_info.h> + /** Application window. */ extern GtkWidget *top_level; @@ -49,4 +52,8 @@ extern GtkWidget *byte_nb_ptr_gbl; /** The filter text entry in the filter toolbar. */ extern GtkWidget *main_display_filter_widget; +extern capture_session global_capture_session; + +extern info_data_t global_info_data; + #endif |