aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-03-18 10:34:41 -0700
committerGerald Combs <gerald@wireshark.org>2016-03-28 16:27:41 +0000
commit6931f581f90d272474b47d4a4606bb93183f449a (patch)
tree08ff02c43d1896ea1d5e14bf28cd9288156e91c8 /epan
parent7e5dae90d65ed062f2d01c63174cc1c94850a19a (diff)
Qt: Make conversation menu items static.
Add a ConversationAction and ColorizeAction classes which respectively handle conversation filtering and colorization. Move conversation menu initialization to initConversationMenus and call it once at startup. This keeps us from leaking quite a bit of memory each time we select a packet or proto tree item. Bug: 12044 Change-Id: I32e8cedaba08a419d5da6a7a9db31c910909f450 Reviewed-on: https://code.wireshark.org/review/14516 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissector_filters.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissector_filters.h b/epan/dissector_filters.h
index 867d64dc34..fe5443b0de 100644
--- a/epan/dissector_filters.h
+++ b/epan/dissector_filters.h
@@ -34,11 +34,11 @@ extern "C" {
*/
/** callback function definition: is a filter available for this packet? */
-typedef gboolean (*is_filter_valid_func)(packet_info *pinfo);
+typedef gboolean (*is_filter_valid_func)(struct _packet_info *pinfo);
/** callback function definition: return the available filter for this packet or NULL if no filter is available,
Filter needs to be freed after use */
-typedef gchar* (*build_filter_string_func)(packet_info *pinfo);
+typedef gchar* (*build_filter_string_func)(struct _packet_info *pinfo);
/** register a dissector filter */
WS_DLL_PUBLIC void register_conversation_filter(const char *proto_name, const char *display_name,