diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-06-22 11:34:48 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-06-26 02:44:05 +0000 |
| commit | 1b7f5d9f798634770656a82aaa2df30f7f01a9b0 (patch) | |
| tree | d6f5e76b402f8125bb2ca25c6c88c6b99408880b /ui/gtk/prefs_dlg.c | |
| parent | 395775acce1ef9624fdf2030179683f37a27cd59 (diff) | |
| download | wireshark-1b7f5d9f798634770656a82aaa2df30f7f01a9b0.tar.gz | |
Convert filter expressions preference data to a UAT.
The filter expressions data was shoved into the preference file in a
very loose, non-arrayed form. It's much easier to manage in code
(and for users in a separate file) as a UAT.
The GTK GUI was hacked to use the existing UAT dialog rather than
rewrite the pref_filter_expressions.c to support a UAT. Should
be okay since it's deprecated.
Change-Id: I688cebb4b7b6594878c1398365e79a205f1902d9
Ping-Bug: 13814
Reviewed-on: https://code.wireshark.org/review/22354
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/gtk/prefs_dlg.c')
| -rw-r--r-- | ui/gtk/prefs_dlg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c index 13d29f319d..d597365837 100644 --- a/ui/gtk/prefs_dlg.c +++ b/ui/gtk/prefs_dlg.c @@ -40,6 +40,7 @@ #include "ui/gtk/prefs_column.h" #include "ui/gtk/prefs_dlg.h" #include "ui/gtk/prefs_filter_expressions.h" +#include "ui/gtk/filter_expression_save_dlg.h" #include "ui/gtk/prefs_font_color.h" #include "ui/gtk/prefs_gui.h" #include "ui/gtk/prefs_layout.h" @@ -1295,8 +1296,9 @@ prefs_main_fetch_all(GtkWidget *dlg, gboolean *must_redissect) } #endif /* _WIN32 */ #endif /* HAVE_LIBPCAP */ - filter_expressions_prefs_fetch((GtkWidget *)g_object_get_data(G_OBJECT(dlg), - E_FILTER_EXPRESSIONS_PAGE_KEY)); + + /* Handle (re)creation of filter buttons */ + filter_expression_reinit(FILTER_EXPRESSION_REINIT_DESTROY | FILTER_EXPRESSION_REINIT_CREATE); prefs_modules_foreach(module_prefs_fetch, must_redissect); return TRUE; |