move drag_and_drop declarations into it's own file

svn path=/trunk/; revision=24927

8 files changed, 49 insertions, 11 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7f1e1be4ee..5fd270e545 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -60,6 +60,7 @@ noinst_HEADERS = \
 	decode_as_dcerpc.h \
 	dfilter_expr_dlg.h \
 	dlg_utils.h	\
+	drag_and_drop.h	\
 	expert_comp_dlg.h	\
 	expert_comp_table.h	\
 	export_object.h	\
diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c
index f212e517b9..0b17c5fceb 100644
--- a/gtk/capture_file_dlg.c
+++ b/gtk/capture_file_dlg.c
@@ -45,6 +45,7 @@
 #include "dlg_utils.h"
 #include "file_dlg.h"
 #include "capture_file_dlg.h"
+#include "drag_and_drop.h"
 #include "main.h"
 #include <epan/prefs.h>
 #include "recent.h"
diff --git a/gtk/drag_and_drop.c b/gtk/drag_and_drop.c
index 78c593c472..69634c980f 100644
--- a/gtk/drag_and_drop.c
+++ b/gtk/drag_and_drop.c
@@ -40,6 +40,7 @@
 #include "../menu.h"
 #include "file.h"
 #include "simple_dialog.h"
+#include "drag_and_drop.h"
 #include "main.h"
 #ifdef HAVE_LIBPCAP
 #include "capture.h"
diff --git a/gtk/drag_and_drop.h b/gtk/drag_and_drop.h
new file mode 100644
index 0000000000..a6b6cd029d
--- /dev/null
+++ b/gtk/drag_and_drop.h
@@ -0,0 +1,40 @@
+/* drag_and_drop_utils.h
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.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 __DRAG_AND_DROP_H__
+#define __DRAG_AND_DROP_H__
+
+
+/** Init the drag-n-drop functionality.
+ *
+ * @param w the target widget for this dnd operations
+ */
+extern void dnd_init(GtkWidget *w);
+
+/** Open a new file coming from drag and drop.
+ * @param cf_names_freeme the selection data reported from GTK
+ */
+extern void dnd_open_file_cmd(gchar *cf_names_freeme);
+
+
+#endif /* __DRAG_AND_DROP_H__ */
diff --git a/gtk/libui.vcproj b/gtk/libui.vcproj
index c888b22153..43bc21b770 100644
--- a/gtk/libui.vcproj
+++ b/gtk/libui.vcproj
@@ -782,6 +782,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\drag_and_drop.h"

+				>

+			</File>

+			<File

 				RelativePath=".\ethclist.h"

 				>

 			</File>

diff --git a/gtk/main.c b/gtk/main.c
index b49b478731..44af49df65 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -131,6 +131,7 @@
 #include "menu.h"
 #include "../main_window.h"
 #include "../menu.h"
+#include "drag_and_drop.h"
 #include "capture_file_dlg.h"
 #include <epan/column.h>
 #include "proto_draw.h"
diff --git a/gtk/main.h b/gtk/main.h
index e2268bef27..6490114bd3 100644
--- a/gtk/main.h
+++ b/gtk/main.h
@@ -326,17 +326,6 @@ extern void main_widgets_show_or_hide(void);
 extern gboolean main_filter_packets(capture_file *cf, const gchar *dftext,
     gboolean force);
 
-/** Init the drag-n-drop functionality.
- *
- * @param w the target widget for this dnd operations
- */
-extern void dnd_init(GtkWidget *w);
-
-/** Open a new file coming from drag and drop.
- * @param cf_names_freeme the selection data reported from GTK
- */
-extern void dnd_open_file_cmd(gchar *cf_names_freeme);
-
 /** Update the packets statusbar to the current values. */
 extern void packets_bar_update(void);
 
diff --git a/gtk/win32-file-dlg.c b/gtk/win32-file-dlg.c
index d63d8315ed..39bfaf2b69 100644
--- a/gtk/win32-file-dlg.c
+++ b/gtk/win32-file-dlg.c
@@ -60,6 +60,7 @@
 #include "capture_file_dlg.h"
 #include "main.h"
 #include "menu.h"
+#include "drag_and_drop.h"
 #if 0
 #include "dlg_utils.h"
 #endif