diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-10-25 10:32:29 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-27 11:41:35 +0000 |
| commit | 616dbd78d6afc4f8825ce159de23b19752859605 (patch) | |
| tree | 83ff123d37b33132a242c26aaf0f2504c2ab4e5b /plugins | |
| parent | b90267bb7549c7be9900141f6737fd127a9a0515 (diff) | |
Replace all "dissector filter" registrations with "dissector color filter" registration.
In the GTK, there was "colorize" (via context menu using color_dissector_filter.{c,h}) or "not colorize" (via main menu using dissector_filters.{c,h}). In Qt, you have the option to colorize (via context menu using color_dissector_filter.{c,h}) or not colorize (via main menu using color_dissector_filter.{c,h}).
Combine all into "colorize" and convert GTK to use color_dissector_filter.{c,h} in the "not colorize" main menu like Qt.
Change-Id: Ib3ca1c822f5f66ab5b812632d808f7905b328483
Reviewed-on: https://code.wireshark.org/review/11263
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 'plugins')
| -rw-r--r-- | plugins/profinet/packet-dcerpc-pn-io.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index 69ebaceb97..4aa82820df 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -50,7 +50,7 @@ #include <epan/packet.h> #include <epan/to_str.h> #include <epan/expert.h> -#include <epan/dissector_filters.h> +#include <epan/color_dissector_filters.h> #include <epan/dissectors/packet-dcerpc.h> #include "packet-pn.h" @@ -9671,7 +9671,7 @@ pn_io_ar_conv_valid(packet_info *pinfo) return ((profinet_type != NULL) && (GPOINTER_TO_UINT(profinet_type) == 10)); } -static const gchar * +static gchar * pn_io_ar_conv_filter(packet_info *pinfo) { pnio_ar_t *ar = (pnio_ar_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_pn_io, 0); @@ -9698,7 +9698,7 @@ pn_io_ar_conv_filter(packet_info *pinfo) return buf; } -static const gchar * +static gchar * pn_io_ar_conv_data_filter(packet_info *pinfo) { pnio_ar_t *ar = (pnio_ar_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_pn_io, 0); @@ -12260,8 +12260,8 @@ proto_register_pn_io (void) register_cleanup_routine(pnio_cleanup); - register_dissector_filter("PN-IO AR", pn_io_ar_conv_valid, pn_io_ar_conv_filter); - register_dissector_filter("PN-IO AR (with data)", pn_io_ar_conv_valid, pn_io_ar_conv_data_filter); + register_color_conversation_filter("pn_io", "PN-IO AR", pn_io_ar_conv_valid, pn_io_ar_conv_filter); + register_color_conversation_filter("pn_io", "PN-IO AR (with data)", pn_io_ar_conv_valid, pn_io_ar_conv_data_filter); } void |