diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/color_filters.c | 7 | ||||
| -rw-r--r-- | epan/prefs.h | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/epan/color_filters.c b/epan/color_filters.c index c9929fd8a9..809c70a35f 100644 --- a/epan/color_filters.c +++ b/epan/color_filters.c @@ -22,6 +22,7 @@ #include <wsutil/filesystem.h> #include <wsutil/file_util.h> +#include <wsutil/report_message.h> #include <wsutil/wslog.h> #include <wsutil/ws_assert.h> @@ -609,8 +610,6 @@ read_filters_file(const gchar *path, FILE *f, gpointer user_data, color_filter_a name = (gchar *)g_malloc(name_len + 1); filter_exp = (gchar *)g_malloc(filter_exp_len + 1); - prefs.unknown_colorfilters = FALSE; - while (1) { if (skip_end_of_line) { @@ -704,10 +703,8 @@ read_filters_file(const gchar *path, FILE *f, gpointer user_data, color_filter_a df_error_t *df_err = NULL; if (!disabled && !dfilter_compile(filter_exp, &temp_dfilter, &df_err)) { - ws_warning("Could not compile \"%s\" in colorfilters file \"%s\".\n%s", - name, path, df_err->msg); + report_warning("Disabling color filter: Could not compile \"%s\" in colorfilters file \"%s\".\n%s", name, path, df_err->msg); dfilter_error_free(df_err); - prefs.unknown_colorfilters = TRUE; /* skip_end_of_line = TRUE; */ disabled = TRUE; diff --git a/epan/prefs.h b/epan/prefs.h index 7a7b72348d..c771a25337 100644 --- a/epan/prefs.h +++ b/epan/prefs.h @@ -211,7 +211,6 @@ typedef struct _e_prefs { gint gui_debounce_timer; gchar *saved_at_version; gboolean unknown_prefs; /* unknown or obsolete pref(s) */ - gboolean unknown_colorfilters; /* Warn when saving unknown or obsolete color filters. */ gboolean gui_qt_packet_list_separator; gboolean gui_qt_packet_header_column_definition; gboolean gui_qt_packet_list_hover_style; /* Enable/Disable mouse-over colorization */ |