Wireshark-commits: [Wireshark-commits] master-2.0 0594bfd: "Color dissector filters" are just filte
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0594bfdf7eb4b14e1d042a1799b5fff0284ba071
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark
Commits:
0594bfd by Guy Harris (guy@xxxxxxxxxxxx):
"Color dissector filters" are just filters.
Rename the color_dissector_filters.[ch] files to just
dissector_filters.[ch], and rename the routines not to include the
string "color_", as those filters can be used as color filters *or*
display filters.
Remove "color_" from other places where we're not doing colorization.
In the GTK+ code, combine the two loops that add menu items for filters
in the dissector-provided filters list into one.
Change-Id: I08ecccc6b1b1be675e4129a0589f36c9f240407c
Reviewed-on: https://code.wireshark.org/review/11379
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
(cherry picked from commit a8a4098e12b1b60548ce1a1887b2a18a54ef790f)
Reviewed-on: https://code.wireshark.org/review/11380
Actions performed:
from 11843b5 packet-dcerpc: Move Auth padding to the right tree
adds 0594bfd "Color dissector filters" are just filters.
Summary of changes:
epan/CMakeLists.txt | 2 +-
epan/Makefile.common | 4 +-
...lor_dissector_filters.c => dissector_filters.c} | 30 ++---
...lor_dissector_filters.h => dissector_filters.h} | 34 +++---
epan/dissectors/packet-enip.c | 6 +-
epan/dissectors/packet-eth.c | 8 +-
epan/dissectors/packet-ip.c | 8 +-
epan/dissectors/packet-ipv6.c | 8 +-
epan/dissectors/packet-tcp.c | 8 +-
epan/dissectors/packet-udp.c | 8 +-
plugins/profinet/packet-dcerpc-pn-io.c | 6 +-
plugins/profinet/packet-dcom-cba-acco.c | 8 +-
ui/gtk/main_menubar.c | 118 +++++++++-----------
ui/qt/main_window_slots.cpp | 40 +++----
14 files changed, 137 insertions(+), 151 deletions(-)
rename epan/{color_dissector_filters.c => dissector_filters.c} (61%)
rename epan/{color_dissector_filters.h => dissector_filters.h} (57%)
