diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-09-08 09:35:10 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-09-08 09:35:10 +0000 |
commit | 1a046d693b9dc8c805c2ece35277c989e00c97ac (patch) | |
tree | 009e808dd13ccefdf589a1d05121c157dd275d25 /gtk/prefs_dlg.c | |
parent | 62894613b0f82178ecbbbc7466ca41ab5629cced (diff) |
From Edwin Groothuis via bug 6207:
Added Filter Toolbar Save functionality.
From me:
Removed unused code.
svn path=/trunk/; revision=38937
Diffstat (limited to 'gtk/prefs_dlg.c')
-rw-r--r-- | gtk/prefs_dlg.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index 2dab83f1da..cec0e2d442 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -43,6 +43,7 @@ #include "gtk/main.h" #include "gtk/prefs_column.h" #include "gtk/prefs_dlg.h" +#include "gtk/prefs_filter_expressions.h" #include "gtk/prefs_print.h" #include "gtk/prefs_stream.h" #include "gtk/prefs_gui.h" @@ -97,6 +98,7 @@ static void prefs_tree_select_cb(GtkTreeSelection *, gpointer); #define E_NAMERES_PAGE_KEY "nameres_options_page" #define E_TAPS_PAGE_KEY "taps_options_page" #define E_PROTOCOLS_PAGE_KEY "protocols_options_page" +#define E_FILTER_EXPRESSIONS_PAGE_KEY "filter_expressions_page" /* * Keep a static pointer to the current "Preferences" window, if any, so that @@ -578,6 +580,13 @@ prefs_page_cb(GtkWidget *w _U_, gpointer dummy _U_, PREFS_PAGE_E prefs_page) prefs_tree_page_add(label_str, cts.page, store, NULL); cts.page++; + /* Saved filter prefs */ + g_strlcpy(label_str, "Filter Expressions", MAX_TREE_NODE_NAME_LEN); + prefs_nb_page_add(prefs_nb, label_str, filter_expressions_prefs_show(), + E_FILTER_EXPRESSIONS_PAGE_KEY); + prefs_tree_page_add(label_str, cts.page, store, NULL); + cts.page++; + /* TAPS player prefs */ g_strlcpy(label_str, "Statistics", MAX_TREE_NODE_NAME_LEN); prefs_nb_page_add(prefs_nb, label_str, stats_prefs_show(), E_TAPS_PAGE_KEY); @@ -1255,6 +1264,8 @@ prefs_main_fetch_all(GtkWidget *dlg, gboolean *must_redissect) #endif /* HAVE_LIBPCAP */ printer_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_PRINT_PAGE_KEY)); nameres_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_NAMERES_PAGE_KEY)); + filter_expressions_prefs_fetch(g_object_get_data(G_OBJECT(dlg), + E_FILTER_EXPRESSIONS_PAGE_KEY)); stats_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_TAPS_PAGE_KEY)); protocols_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_PROTOCOLS_PAGE_KEY)); prefs_modules_foreach(module_prefs_fetch, must_redissect); |