diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-28 09:13:10 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-28 09:13:10 +0000 |
| commit | ceef26d2c17d4ea94e1d323d2538f5488e734a92 (patch) | |
| tree | 0da9239313e69f8834f9e0f21acc328ae614045f /gtk/menu.c | |
| parent | 3c596f5d718465872676cdf4330d6174bc68342d (diff) | |
Have separate capture and display filter lists; some filter dialog boxes
use the capture filter lists, and others use the display filter list, as
appropriate.
Have separate menu items for editing the capture and display filter
lists.
Have separate "~/.ethereal/cfilters" and "~/.ethereal/dfilters" files
for the two lists; if either of those files isn't found, we try
"~/.ethereal/filters", which means that you will start out with two
identical lists holding all your filters - if certain filters belong
only in one list, you'll have to delete them by hand from the other
list.
Do I/O error checking when reading and writing filter lists; when
writing a filter list, write it to a new file, and then rename the new
file on top of the old file, so that you don't lose your old filter list
if, for example, you run out of disk space or disk quota.
svn path=/trunk/; revision=2948
Diffstat (limited to 'gtk/menu.c')
| -rw-r--r-- | gtk/menu.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk/menu.c b/gtk/menu.c index ed6d2e03a4..212e76e106 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -1,7 +1,7 @@ /* menu.c * Menu routines * - * $Id: menu.c,v 1.46 2000/10/19 22:59:24 guy Exp $ + * $Id: menu.c,v 1.47 2001/01/28 09:13:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -120,7 +120,8 @@ static GtkItemFactoryEntry menu_items[] = {"/Edit/_Unmark All Frames", NULL, GTK_MENU_FUNC(unmark_all_frames_cb), 0, NULL}, {"/Edit/<separator>", NULL, NULL, 0, "<Separator>"}, {"/Edit/_Preferences...", NULL, GTK_MENU_FUNC(prefs_cb), 0, NULL}, - {"/Edit/_Filters...", NULL, GTK_MENU_FUNC(filter_dialog_cb), 0, NULL}, + {"/Edit/_Capture Filters...", NULL, GTK_MENU_FUNC(cfilter_dialog_cb), 0, NULL}, + {"/Edit/_Display Filters...", NULL, GTK_MENU_FUNC(dfilter_dialog_cb), 0, NULL}, {"/Edit/P_rotocols...", NULL, GTK_MENU_FUNC(proto_cb), 0, NULL}, #ifdef HAVE_LIBPCAP {"/_Capture", NULL, NULL, 0, "<Branch>" }, @@ -159,7 +160,7 @@ static int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]); static GtkItemFactoryEntry packet_list_menu_items[] = { {"/Follow TCP Stream", NULL, GTK_MENU_FUNC(follow_stream_cb), 0, NULL}, - {"/Filters...", NULL, GTK_MENU_FUNC(filter_dialog_cb), 0, NULL}, + {"/Display Filters...", NULL, GTK_MENU_FUNC(dfilter_dialog_cb), 0, NULL}, {"/<separator>", NULL, NULL, 0, "<Separator>"}, {"/Colorize Display...", NULL, GTK_MENU_FUNC(color_display_cb), 0, NULL}, {"/Print...", NULL, GTK_MENU_FUNC(file_print_cmd_cb), 0, NULL}, @@ -170,7 +171,7 @@ static GtkItemFactoryEntry packet_list_menu_items[] = static GtkItemFactoryEntry tree_view_menu_items[] = { {"/Follow TCP Stream", NULL, GTK_MENU_FUNC(follow_stream_cb), 0, NULL}, - {"/Filters...", NULL, GTK_MENU_FUNC(filter_dialog_cb), 0, NULL}, + {"/Display Filters...", NULL, GTK_MENU_FUNC(dfilter_dialog_cb), 0, NULL}, {"/<separator>", NULL, NULL, 0, "<Separator>"}, {"/Resolve Name", NULL, GTK_MENU_FUNC(resolve_name_cb), 0, NULL}, {"/Protocol Properties...", NULL, GTK_MENU_FUNC(properties_cb), 0, NULL}, @@ -183,7 +184,7 @@ static GtkItemFactoryEntry tree_view_menu_items[] = static GtkItemFactoryEntry hexdump_menu_items[] = { {"/Follow TCP Stream", NULL, GTK_MENU_FUNC(follow_stream_cb), 0, NULL}, - {"/Filters...", NULL, GTK_MENU_FUNC(filter_dialog_cb), 0, NULL} + {"/Display Filters...", NULL, GTK_MENU_FUNC(dfilter_dialog_cb), 0, NULL} }; static int initialize = TRUE; |