diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-07-17 04:52:19 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-07-17 04:52:19 +0000 |
| commit | e0341f776c6d5d540013175e79b0000aa480b54d (patch) | |
| tree | ffe9491cf297fac02ff382fa87c7351157166e18 /color_filters.c | |
| parent | 97ca7816718cb7e22b4c8d03b40fae63459eaaf7 (diff) | |
From Cal Turney:
Unrecognized preferences and color filters created in proprietary or older versions are discarded when saved.
If the user attempts to save the preferences or colorfilters file, a popup is displayed that warns that unrecognized prefs or color filters have been detected and will be discarded if the save operation is allowed to proceed. In the case of Preferences, the popup message includes the version at which the file was last saved. A "Continue without Saving" button is provided so that the user can save the profile under a different name.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8942
svn path=/trunk/; revision=50690
Diffstat (limited to 'color_filters.c')
| -rw-r--r-- | color_filters.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/color_filters.c b/color_filters.c index b960be5b38..ae894363d3 100644 --- a/color_filters.c +++ b/color_filters.c @@ -570,8 +570,10 @@ read_filters_file(FILE *f, gpointer user_data) dfilter_t *temp_dfilter; if (!dfilter_compile(filter_exp, &temp_dfilter)) { - g_warning("Could not compile color filter \"%s\" from saved filters: %s", + g_warning("Could not compile \"%s\" in colorfilters file.\n%s", name, dfilter_error_msg); + prefs.unknown_colorfilters = TRUE; + skip_end_of_line = TRUE; continue; } |