aboutsummaryrefslogtreecommitdiffstats
path: root/epan/prefs.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-09-20 11:30:38 -0700
committerMichael Mann <mmann78@netscape.net>2016-10-03 17:47:39 +0000
commit1320ea4d57bf376a6a1923a7103d3321b4de8cc3 (patch)
tree2d3d46b240884b314cf758488bf219d3f3ef4c7e /epan/prefs.h
parentd2a59db2bbf944da07710d31d4f86fe5a27490dd (diff)
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>
Diffstat (limited to 'epan/prefs.h')
-rw-r--r--epan/prefs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/prefs.h b/epan/prefs.h
index 81243b3b69..bbec99c70d 100644
--- a/epan/prefs.h
+++ b/epan/prefs.h
@@ -221,7 +221,7 @@ typedef struct _e_prefs {
gint gui_update_interval;
gchar *saved_at_version;
gboolean unknown_prefs; /* unknown or obsolete pref(s) */
- gboolean unknown_colorfilters; /* unknown or obsolete color filter(s) */
+ gboolean unknown_colorfilters; /* Warn when saving unknown or obsolete color filters. */
gboolean gui_qt_packet_list_separator;
gboolean gui_packet_editor; /* Enable Packet Editor */
elide_mode_e gui_packet_list_elide_mode;