Wireshark · Wireshark-commits: [Wireshark-commits] master-2.2 9c4efbd: Be more forgiving about invalid Coloring Rules.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9c4efbd1dc9f352eb5f63f099a79eb3d8be8f46a
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

9c4efbd by Gerald Combs (gerald@xxxxxxxxxxxxx):

    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@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 1320ea4d57bf376a6a1923a7103d3321b4de8cc3)
    Reviewed-on: https://code.wireshark.org/review/18047
    

Actions performed:

    from  04927d8   p1: Handle implicit Content
    adds  9c4efbd   Be more forgiving about invalid Coloring Rules.


Summary of changes:
 docbook/release-notes.asciidoc  |    2 ++
 epan/color_filters.c            |   10 +++++++++-
 epan/prefs.h                    |    2 +-
 ui/qt/coloring_rules_dialog.cpp |   12 +++++++-----
 4 files changed, 19 insertions(+), 7 deletions(-)