diff options
| -rw-r--r-- | gtk/file_dlg.h | 4 | ||||
| -rw-r--r-- | gtk/main.c | 3 | ||||
| -rw-r--r-- | gtk/packet_win.h | 4 | ||||
| -rw-r--r-- | gtk/proto_draw.h | 13 | ||||
| -rw-r--r-- | ui_util.h | 25 |
5 files changed, 26 insertions, 23 deletions
diff --git a/gtk/file_dlg.h b/gtk/file_dlg.h index 143bce5ef8..7a86136362 100644 --- a/gtk/file_dlg.h +++ b/gtk/file_dlg.h @@ -49,6 +49,10 @@ typedef enum { */ void file_save_as_cmd(action_after_save_e action_after_save, gpointer action_after_save_data); +/** Destroy the save as dialog. + */ +void file_save_as_destroy(void); + /** User requested the "Open" dialog box. * * @param widget parent widget diff --git a/gtk/main.c b/gtk/main.c index 2e29f8eb08..1a32ca6388 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1291,7 +1291,8 @@ main_cf_cb_file_closing(capture_file *cf) /* Destroy all windows, which refer to the capture file we're closing. */ - destroy_cfile_wins(); + destroy_packet_wins(); + file_save_as_destroy(); /* Clear any file-related status bar messages. XXX - should be "clear *ALL* file-related status bar messages; diff --git a/gtk/packet_win.h b/gtk/packet_win.h index e582ade17f..38b2ac7561 100644 --- a/gtk/packet_win.h +++ b/gtk/packet_win.h @@ -37,6 +37,10 @@ */ extern void new_window_cb(GtkWidget *widget); +/** Destroy all popup packet windows. + */ +void destroy_packet_wins(void); + /** Redraw the hex dump panes of all packet windows. */ void redraw_hex_dump_packet_wins(void); diff --git a/gtk/proto_draw.h b/gtk/proto_draw.h index 54b5868985..7dd82ff6d0 100644 --- a/gtk/proto_draw.h +++ b/gtk/proto_draw.h @@ -30,6 +30,19 @@ * @ingroup main_window_group */ +/** Create byte views in the main window. + */ +void add_main_byte_views(epan_dissect_t *edt); + +/** Display the protocol tree in the main window. + */ +void main_proto_tree_draw(proto_tree *protocol_tree); + +/** Clear the hex dump and protocol tree panes. + */ +void clear_tree_and_hex_views(void); + + /** Get the current text notebook page of the packet details notebook. * * @param nb_ptr the notebook widget @@ -43,8 +43,10 @@ extern void main_window_exit(void); extern void main_window_nested_quit(void); /* quit the main window */ extern void main_window_quit(void); -/* read from a pipe */ + +/* read from a pipe (callback) */ typedef gboolean (*pipe_input_cb_t) (gint source, gpointer user_data); +/* install callback function, called if pipe input is available */ extern void pipe_input_set_handler(gint source, gpointer user_data, int *child_process, pipe_input_cb_t input_cb); /* packet_list.c */ @@ -64,27 +66,6 @@ gpointer packet_list_get_row_data(gint); void packet_list_set_selected_row(gint); gint packet_list_get_sort_column(void); -/* proto_draw.c */ - -/* create byte views in the main window */ -void add_main_byte_views(epan_dissect_t *edt); -/* display the protocol tree in the main window */ -void main_proto_tree_draw(proto_tree *protocol_tree); -void clear_tree_and_hex_views(void); - -/* packet_win.c */ - -/* Destroy all popup packet windows. */ -void destroy_packet_wins(void); - -/* file_dlg.c */ - -/* Destroy the save as dialog */ -void file_save_as_destroy(void); - -#define destroy_cfile_wins() \ - destroy_packet_wins(); \ - file_save_as_destroy(); #ifdef __cplusplus } |