diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-06-03 21:46:27 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-06-03 21:46:27 +0000 |
| commit | 1efcdea8ab35da86616fa0d07fa08bc078f6f43f (patch) | |
| tree | 7b7174dc8dc7d1e441cc926da21c7eb6c0a3b1b0 /gtk/menu.c | |
| parent | 2721179bf69a40eaa7dc7b2e9868d6fa7f34b18c (diff) | |
Make static some routines and variables not used outside the source file
defining them.
Move declarations of some callbacks outside the source files using them
into the appropriate header, and arrange that the appropriate header is
included by those source files.
Move the SAT_E definition into a "sat.h" file, included both by
"endpoint_talkers_table.h" and "hostlist_table.h", so that both of the
latter headers can be included by the same file ("menu.c" has to include
both, as per the change in the previous paragraph).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11096 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/menu.c')
| -rw-r--r-- | gtk/menu.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gtk/menu.c b/gtk/menu.c index ae27232aec..c9b7c60bdf 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -1,7 +1,7 @@ /* menu.c * Menu routines * - * $Id: menu.c,v 1.200 2004/06/03 02:14:50 guy Exp $ + * $Id: menu.c,v 1.201 2004/06/03 21:46:27 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -69,27 +69,25 @@ #include "recent.h" #include "../ui_util.h" #include "proto_draw.h" +#include "endpoint_talkers_table.h" +#include "hostlist_table.h" #include "simple_dialog.h" #include <epan/timestamp.h> GtkWidget *popup_menu_object; -extern void savehex_cb(GtkWidget * w, gpointer data _U_); -extern void init_ett_notebook_cb(GtkWidget *w _U_, gpointer d _U_); -extern void init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_); - static void clear_menu_recent_capture_file_cmd_cb(GtkWidget *w, gpointer unused _U_); typedef struct _menu_item { - char *name; + char *name; gint group; - gboolean enabled; + gboolean enabled; GtkItemFactoryCallback callback; gpointer callback_data; - gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *); - gboolean (*selected_tree_row_enabled)(field_info *); - GList *children; + gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *); + gboolean (*selected_tree_row_enabled)(field_info *); + GList *children; } menu_item_t; static GList *tap_menu_tree_root = NULL; |