Be more forgiving about invalid Coloring Rules.
authorGerald Combs <gerald@wireshark.org>
Tue, 20 Sep 2016 18:30:38 +0000 (11:30 -0700)
committerMichael Mann <mmann78@netscape.net>
Mon, 3 Oct 2016 17:47:39 +0000 (17:47 +0000)
commit1320ea4d57bf376a6a1923a7103d3321b4de8cc3
tree2d3d46b240884b314cf758488bf219d3f3ef4c7e
parentd2a59db2bbf944da07710d31d4f86fe5a27490dd
Be more forgiving about invalid Coloring Rules.

In ColoringRulesDialog:

Only check a rule's display filter if that rule is enabled. This keeps
us from disabling the OK button when we shouldn't.

Adjust the "Your coloring rules file contains unknown rules" dialog text
and buttons for accuracy.

In color_filters.c:

Don't try to compile disabled filters in color_filters_apply. Don't warn
about disabled and invalid filters in read_filters_file.

Bug: 12814
Change-Id: I7143bf8e7a6162d296f1e93769344b69763195c8
Reviewed-on: https://code.wireshark.org/review/17823
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
epan/color_filters.c
epan/prefs.h
ui/qt/coloring_rules_dialog.cpp