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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18034 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 4da0b7ba31467e63230146350c8f78326c26eb0c..063c31ede7f20e45631b5adc8b543d0b47053a7b 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -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      \

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 3baed4c150e8d7d70742059b4c6ee1799de67f1c..66dc5775753c5a12fcb50dc3845f96f4a41ccd19 100644 (file)
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -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      \

diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index c5a6dc1e7edf85f1bad69ae8849168d6bf7e7363..33e1e0ec6decf629dbcefd0197b4e0d14265a030 100644 (file)
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -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"

diff --git a/gtk/file_dlg.c b/gtk/capture_file_dlg.c
similarity index 99%
rename from gtk/file_dlg.c
rename to gtk/capture_file_dlg.c
index 81da2cde60038928399af931b061c1a96eacd5ad..6c9232e20a47d7c8c8d20eb9036b991b4300c375 100644 (file)
--- a/gtk/file_dlg.c
+++ b/gtk/capture_file_dlg.c
@@ -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>

diff --git a/gtk/file_dlg.h b/gtk/capture_file_dlg.h
similarity index 98%
rename from gtk/file_dlg.h
rename to gtk/capture_file_dlg.h
index 9ad1511242e2f24b02200d048f18fc78b25ea0d1..3a980ef97b46b7c798ef6801a9532ed790245bd3 100644 (file)
--- a/gtk/file_dlg.h
+++ b/gtk/capture_file_dlg.h
@@ -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 */

diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index 3e7a0c65c206edca6bc1a2ccae8d199d8680dc10..45b1f1f160d474022f68eb5c5bfa3791e3628c44 100644 (file)
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -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"

diff --git a/gtk/drag_and_drop.c b/gtk/drag_and_drop.c
index 86471eee82c51a5bbc466e9d8da754fd38d77e62..43825014b1afcf90de387fd23a0358a8fdd39ebe 100644 (file)
--- a/gtk/drag_and_drop.c
+++ b/gtk/drag_and_drop.c
@@ -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"

diff --git a/gtk/main.c b/gtk/main.c
index ebda7a10b5937a0d65be6e90515f15fa81bba74b..b69b4405ca7a809a324f92ab06a222d0a5ac4c0a 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -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"

diff --git a/gtk/menu.c b/gtk/menu.c
index fcca34f315f63181192a495f5eb503d627c62eb9..12af55fd227e7947afd211e7d3199a7cbdcbd012 100644 (file)
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -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"

diff --git a/gtk/packet_list.c b/gtk/packet_list.c
index 4792efc24d5e1e9462139a4d937f2739ed568b94..80ea3b53f702360f35b614600590f6027177dbfa 100644 (file)
--- a/gtk/packet_list.c
+++ b/gtk/packet_list.c
@@ -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"

diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index de1bbc62314414b49b6f88feee8fe2e44e128c46..27ba8aff04486a62f30c634434e76237485b739c 100644 (file)
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -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"

diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c
index 451c50f400ca831427230fd94b00359d4def7e62..a0a8d99217da450ab41e327746ef9539da178091 100644 (file)
--- a/gtk/print_prefs.c
+++ b/gtk/print_prefs.c
@@ -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"
 

diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index 745c55c0e10006529b21aada07d55c39fd5a65c9..d65c48559bb2b206fe2e794118bc50d18628b70f 100644 (file)
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.c
@@ -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"

diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index ddcb66cad2f2e353179ddfefb8c46584797160f0..f68f43bdd78d00bc56208d1672d8ba398c84d650 100644 (file)
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -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"

diff --git a/gtk/win32-file-dlg.c b/gtk/win32-file-dlg.c
index 1cb94326c481b6294d48be48b869c4f76080b3ce..81f993fd7bf34d0296b81445dcd5c31252efdb80 100644 (file)
--- a/gtk/win32-file-dlg.c
+++ b/gtk/win32-file-dlg.c
@@ -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?
  */