Move the declarations of the routines in "gtk/file_dlg.c" out of

"gtk/main.h" and into a new "gtk/file_dlg.h" file.

svn path=/trunk/; revision=1620

5 files changed, 42 insertions, 12 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7210b43ae4..6df80d6010 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for the GTK interface routines for Ethereal
 #
-# $Id: Makefile.am,v 1.21 2000/01/17 18:14:13 gram Exp $
+# $Id: Makefile.am,v 1.22 2000/02/12 06:58:41 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -36,6 +36,7 @@ libui_a_SOURCES = \
 	display_opts.c	\
 	display_opts.h	\
 	file_dlg.c	\
+	file_dlg.h	\
 	filter_prefs.c	\
 	filter_prefs.h	\
 	find_dlg.c	\
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index 183c3a76d6..32de6d755b 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -1,7 +1,7 @@
 /* file_dlg.c
  * Dialog boxes for handling files
  *
- * $Id: file_dlg.c,v 1.19 2000/02/12 06:46:52 guy Exp $
+ * $Id: file_dlg.c,v 1.20 2000/02/12 06:58:41 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -58,9 +58,7 @@
 #include "menu.h"
 #endif
 
-#ifndef __MAIN_H__
-#include "main.h"
-#endif
+#include "file_dlg.h"
 
 #ifndef __UTIL_H__
 #include "util.h"
diff --git a/gtk/file_dlg.h b/gtk/file_dlg.h
new file mode 100644
index 0000000000..6076d1f28b
--- /dev/null
+++ b/gtk/file_dlg.h
@@ -0,0 +1,35 @@
+/* file_dlg.h
+ * Definitions for dialog boxes for handling files
+ *
+ * $Id: file_dlg.h,v 1.1 2000/02/12 06:58:41 guy Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef __FILE_DLG_H__
+#define __FILE_DLG_H__
+
+void file_open_cmd_cb(GtkWidget *, gpointer);
+void file_save_cmd_cb(GtkWidget *, gpointer);
+void file_save_as_cmd_cb(GtkWidget *, gpointer);
+void file_close_cmd_cb(GtkWidget *, gpointer);
+void file_reload_cmd_cb(GtkWidget *, gpointer);
+
+#endif /* file_dlg.h */
diff --git a/gtk/main.h b/gtk/main.h
index e1bca39cda..af4bc92193 100644
--- a/gtk/main.h
+++ b/gtk/main.h
@@ -1,7 +1,7 @@
 /* ethereal.h
  * Global defines, etc.
  *
- * $Id: main.h,v 1.12 2000/02/12 06:46:54 guy Exp $
+ * $Id: main.h,v 1.13 2000/02/12 06:58:41 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -61,12 +61,7 @@ void about_ethereal( GtkWidget *, gpointer);
 void blank_packetinfo();
 void follow_stream_cb( GtkWidget *, gpointer);
 void match_selected_cb( GtkWidget *, gpointer);
-void file_open_cmd_cb(GtkWidget *, gpointer);
-void file_save_cmd_cb(GtkWidget *, gpointer);
-void file_save_as_cmd_cb(GtkWidget *, gpointer);
-void file_close_cmd_cb(GtkWidget *, gpointer);
 void file_quit_cmd_cb(GtkWidget *, gpointer);
-void file_reload_cmd_cb(GtkWidget *, gpointer);
 void file_print_cmd_cb(GtkWidget *, gpointer);
 void file_print_packet_cmd_cb(GtkWidget *, gpointer);
 void tools_plugins_cmd_cb(GtkWidget *, gpointer);
diff --git a/gtk/menu.c b/gtk/menu.c
index 21d096507c..9b85539a54 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.22 2000/02/12 06:46:54 guy Exp $
+ * $Id: menu.c,v 1.23 2000/02/12 06:58:42 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -43,6 +43,7 @@
 #include "menu.h"
 #include "packet.h"
 #include "capture_dlg.h"
+#include "file_dlg.h"
 #include "filter_prefs.h"
 #include "find_dlg.h"
 #include "goto_dlg.h"