From 2851b7ef7678a6dbe177c33efc545033a38c6628 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 5 Jun 2001 07:39:31 +0000 Subject: Enable "Match Selected" only if there's a field selected *and* we can do a "Match Selected" on it - we can't do a "Match Selected" if the field has no value (e.g., FT_NULL) and has a length of 0. If we unselect the current packet, we don't have a protocol tree, so we don't have a currently selected field - clear the "Match Selected" menu item and the display in the status line of information about the currently selected field. Move the low-level statusbar manipulation into "gtk/main.c", in routines whose API doesn't expose anything GTK+-ish. "close_cap_file()" calls one of those routines to clear out the status bar, so it doesn't need to take a pointer to the statusbar widget as an argument. "clear_tree_and_hex_views()" is purely a display-manipulating routine; move it to "gtk/proto_draw.c". Extract from "tree_view_unselect_row_cb()" an "unselect_field()" routine to do all the work that needs to be done if the currently selected protocol tree row is unselected, and call it if the currently selected packet list row is unselected (if it's unselected, there *is* no protocol tree, so no row can be selected), as well as from "tree_view_unselect_row_cb()". Before pushing a new field-description message onto the statusbar, pop the old one off. Get rid of an unused variable (set, but not used). svn path=/trunk/; revision=3513 --- globals.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'globals.h') diff --git a/globals.h b/globals.h index b9fd5be655..5bb3dd4ba9 100644 --- a/globals.h +++ b/globals.h @@ -1,12 +1,11 @@ /* globals.h * Global defines, etc. * - * $Id: globals.h,v 1.25 2001/05/01 00:18:46 guy Exp $ + * $Id: globals.h,v 1.26 2001/06/05 07:38:33 guy Exp $ * * Ethereal - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs - * * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -33,7 +32,6 @@ #define MIN_PACKET_SIZE 68 /* minimum amount of packet data we can read */ extern capture_file cfile; -extern guint main_ctx, file_ctx; extern gchar *ethereal_path; extern gchar *last_open_dir; extern field_info *finfo_selected; -- cgit v1.2.1