Wireshark-commits: [Wireshark-commits] master 1320ea4: Be more forgiving about invalid Coloring Rul

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 3 Oct 2016 17:48:06 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1320ea4d57bf376a6a1923a7103d3321b4de8cc3
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

1320ea4 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>
    

Actions performed:

    from  d2a59db   PROFINET: Add preliminary version of the Reporting System (RS) dissection.
    adds  1320ea4   Be more forgiving about invalid Coloring Rules.


Summary of changes:
 epan/color_filters.c            |   10 +++++++++-
 epan/prefs.h                    |    2 +-
 ui/qt/coloring_rules_dialog.cpp |   12 +++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)