osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Most of the stuff in file_dlg.c is specific to capture files, so rename 

it to capture_file_dlg.c, and rename its header file.  We might want to
move the generic file dialog stuff to a file_dlg.c file (it's currently
in dlg_utils.c), and move the non-capture-file dialog stuff in
capture_file_dlg.c to another file.

svn path=/trunk/; revision=18034
This commit is contained in:
Guy Harris 2006-04-29 23:03:57 +00:00
parent fe6af4d65d
commit 0ce9a23b25
15 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/Makefile.am
View File

@ -40,8 +40,9 @@ ethereal-tap-register.c: $(ETHEREAL_TAP_SRC) $(top_srcdir)/make-tapreg-dotc
noinst_HEADERS = \
about_dlg.h \
capture_dlg.h \
capture_prefs.h \
capture_file_dlg.h \
capture_if_details_dlg.h \
capture_prefs.h \
cfilter_combo_utils.h \
color_dlg.h \
colors.h \
@ -53,7 +54,6 @@ noinst_HEADERS = \
dfilter_expr_dlg.h \
dlg_utils.h \
expert_comp_table.h \
file_dlg.h \
fileset_dlg.h \
filter_dlg.h \
find_dlg.h \

2
gtk/Makefile.common
View File

@ -41,6 +41,7 @@ GENERATED_FILES = $(GENERATED_HEADER_FILES) $(GENERATED_C_FILES)
ETHEREAL_GTK_SRC = \
about_dlg.c \
capture_dlg.c \
capture_file_dlg.c \
capture_if_dlg.c \
capture_if_details_dlg.c \
capture_info_dlg.c \
@ -58,7 +59,6 @@ ETHEREAL_GTK_SRC = \
drag_and_drop.c \
ethereal-tap-register.c \
expert_comp_table.c \
file_dlg.c \
fileset_dlg.c \
filter_dlg.c \
find_dlg.c \

2
gtk/capture_dlg.c
View File

@ -51,7 +51,7 @@
#include "ringbuffer.h"
#include <epan/filesystem.h>
#include "compat_macros.h"
#include "file_dlg.h"
#include "capture_file_dlg.h"
#include "help_dlg.h"
#include "gtkglobals.h"
#include "cfilter_combo_utils.h"

6
gtk/file_dlg.c → gtk/capture_file_dlg.c
View File

@ -1,5 +1,5 @@
/* file_dlg.c
* Dialog boxes for handling files
/* capture_file_dlg.c
* Dialog boxes for handling capture files
*
* $Id$
*
@ -43,7 +43,7 @@
#include "simple_dialog.h"
#include "menu.h"
#include "dlg_utils.h"
#include "file_dlg.h"
#include "capture_file_dlg.h"
#include "main.h"
#include "compat_macros.h"
#include <epan/prefs.h>

4
gtk/file_dlg.h → gtk/capture_file_dlg.h
View File

@ -1,4 +1,4 @@
/* file_dlg.h
/* capture_file_dlg.h
* Definitions for dialog boxes for handling files
*
* $Id$
@ -117,4 +117,4 @@ void file_color_export_cmd_cb(GtkWidget *widget, gpointer data);
*/
void file_save_update_dynamics(void);
#endif /* file_dlg.h */
#endif /* capture_file_dlg.h */

2
gtk/color_dlg.c
View File

@ -44,7 +44,7 @@
#include "dfilter_expr_dlg.h"
#include "compat_macros.h"
#include "filter_dlg.h"
#include "file_dlg.h"
#include "capture_file_dlg.h"
#include "gtkglobals.h"
#include <epan/prefs.h>
#include "help_dlg.h"

2
gtk/drag_and_drop.c
View File

@ -32,7 +32,7 @@
#include "gtkglobals.h"
#include "util.h"
#include "file_dlg.h"
#include "capture_file_dlg.h"
#include "../menu.h"
#include "compat_macros.h"
#include "file.h"

2
gtk/main.c
View File

@ -122,7 +122,7 @@
#include "menu.h"
#include "../main_window.h"
#include "../menu.h"
#include "file_dlg.h"
#include "capture_file_dlg.h"
#include <epan/column.h>
#include "proto_draw.h"
#include "keys.h"

2
gtk/menu.c
View File

@ -46,7 +46,7 @@
#include "color_dlg.h"
#include "filter_dlg.h"
#include "dlg_utils.h"
#include "file_dlg.h"
#include "capture_file_dlg.h"
#include "fileset_dlg.h"
#include "find_dlg.h"
#include "goto_dlg.h"

2
gtk/packet_list.c
View File

@ -43,7 +43,7 @@
#include "epan/column_info.h"
#include "compat_macros.h"
#include <epan/prefs.h>
#include "file_dlg.h"
#include "capture_file_dlg.h"
#include "packet_list.h"
#include "keys.h"
#include "font_utils.h"

2
gtk/print_dlg.c
View File

@ -37,7 +37,7 @@
#include <epan/prefs.h>
#include "alert_box.h"
#include "simple_dialog.h"
#include "file_dlg.h"
#include "capture_file_dlg.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "main.h"

2
gtk/print_prefs.c
View File

@ -38,7 +38,7 @@
#include "util.h"
#include "gui_utils.h"
#include "dlg_utils.h"
#include "file_dlg.h"
#include "capture_file_dlg.h"
#include "compat_macros.h"
#include "gtkglobals.h"

2
gtk/proto_draw.c
View File

@ -56,7 +56,7 @@
#include <epan/prefs.h>
#include "colors.h"
#include "file_dlg.h"
#include "capture_file_dlg.h"
#include "proto_draw.h"
#include "packet_win.h"
#include "dlg_utils.h"

2
gtk/toolbar.c
View File

@ -47,7 +47,7 @@
#include "capture_dlg.h"
#endif /* HAVE_LIBPCAP */
#include "filter_dlg.h"
#include "file_dlg.h"
#include "capture_file_dlg.h"
#include "find_dlg.h"
#include "goto_dlg.h"
#include "color.h"

4
gtk/win32-file-dlg.c
View File

@ -56,7 +56,7 @@
#include "util.h"
#include "epan/strutil.h"
#include "file_dlg.h"
#include "capture_file_dlg.h"
#include "main.h"
#include "menu.h"
#include "dlg_utils.h"
@ -990,7 +990,7 @@ open_file_hook_proc(HWND of_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) {
return 0;
}
/* XXX - Copied verbatim from gtk/file_dlg.c. Perhaps it
/* XXX - Copied verbatim from gtk/capture_file_dlg.c. Perhaps it
* should be in wiretap instead?
*/