Start splitting out drag&drop code common between icon view and list view

2000-05-29  Pavel Cisler <pavel@eazel.com>

	* libnautilus-extensions/Makefile.am:
	* libnautilus-extensions/nautilus-drag.c:
	* libnautilus-extensions/nautilus-drag.h:
	* libnautilus-extensions/nautilus-icon-dnd.c:
	* libnautilus-extensions/nautilus-icon-dnd.h:
	* libnautilus-extensions/nautilus-list.c:
	(nautilus_drag_selection_item_new), (drag_selection_item_destroy),
	(nautilus_drag_destroy_selection_list),
	(nautilus_drag_build_selection_list),
	(create_selection_shadow),
	(nautilus_icon_container_dropped_icon_feedback),
	(drag_data_received_callback),
	(nautilus_icon_container_ensure_drag_data), (drag_end_callback),
	(nautilus_icon_container_selection_items_local),
	(nautilus_icon_canvas_item_can_accept_items), (handle_local_move),
	(handle_nonlocal_move),
	(nautilus_icon_container_receive_dropped_icons),
	(nautilus_icon_container_free_drag_data), (nautilus_icon_dnd_fini),
	(drag_drop_callback), (nautilus_list_initialize), (nautilus_list_drag_end),
	(nautilus_list_drag_leave), (nautilus_list_drag_drop),
	(nautilus_list_drag_data_received):
	Start splitting out drag&drop code common between icon view and list view
	into a new file.
	Start adding drag&drop calls to list view.
	Bunch of renamings.

1 files changed, 5 insertions, 25 deletions

diff --git a/libnautilus-private/nautilus-icon-dnd.h b/libnautilus-private/nautilus-icon-dnd.h
index 4bd3a1894..3415495a6 100644
--- a/libnautilus-private/nautilus-icon-dnd.h
+++ b/libnautilus-private/nautilus-icon-dnd.h
@@ -29,36 +29,16 @@
 #define NAUTILUS_ICON_DND_H
 
 #include "nautilus-icon-container.h"
+#include "nautilus-drag.h"
+
 
-#include <gtk/gtkdnd.h>
-
-typedef struct NautilusIconDndInfo NautilusIconDndInfo;
-typedef enum NautilusIconDndTargetType NautilusIconDndTargetType;
-
-/* Standard DnD types. */
-enum NautilusIconDndTargetType {
-	NAUTILUS_ICON_DND_GNOME_ICON_LIST,
-	NAUTILUS_ICON_DND_URI_LIST,
-	NAUTILUS_ICON_DND_URL,
-	NAUTILUS_ICON_DND_COLOR,
-	NAUTILUS_ICON_DND_BGIMAGE,
-	NAUTILUS_ICON_DND_KEYWORD
-};
-
-/* DnD target names. */
-#define NAUTILUS_ICON_DND_GNOME_ICON_LIST_TYPE "special/x-gnome-icon-list"
-#define NAUTILUS_ICON_DND_URI_LIST_TYPE        "text/uri-list"
-#define NAUTILUS_ICON_DND_URL_TYPE	       "_NETSCAPE_URL"
-#define NAUTILUS_ICON_DND_COLOR_TYPE           "application/x-color"
-#define NAUTILUS_ICON_DND_BGIMAGE_TYPE         "property/bgimage"
-#define NAUTILUS_ICON_DND_KEYWORD_TYPE         "property/keyword"
 
 /* DnD-related information. */
-struct NautilusIconDndInfo {
+typedef struct {
 	GtkTargetList *target_list;
 
 	/* Stuff saved at "receive data" time needed later in the drag. */
-	gboolean got_data_type;
+	gboolean got_drop_data_type;
 	NautilusIconDndTargetType data_type;
 	GtkSelectionData *selection_data;
 
@@ -75,7 +55,7 @@ struct NautilusIconDndInfo {
 
 	/* Shadow for the icons being dragged.  */
 	GnomeCanvasItem *shadow;
-};
+} NautilusIconDndInfo;
 
 void nautilus_icon_dnd_init       (NautilusIconContainer *container,
 				   GdkBitmap             *stipple);