Make the desktop icon view store the screen number with the icon

2002-12-19  James Willcox  <jwillcox@gnome.org>

	* libnautilus-private/nautilus-directory-notify.h:
	* libnautilus-private/nautilus-directory.c:
	(nautilus_directory_schedule_position_set):
	* libnautilus-private/nautilus-file-changes-queue.c:
	(nautilus_file_changes_queue_schedule_position_set),
	(nautilus_file_changes_consume_changes):
	* libnautilus-private/nautilus-file-changes-queue.h:
	* libnautilus-private/nautilus-file-operations.c:
	(icon_position_iterator_new), (apply_one_position),
	(nautilus_file_operations_copy_move):
	* libnautilus-private/nautilus-icon-dnd.c: (handle_local_move),
	(handle_nonlocal_move):
	* libnautilus-private/nautilus-metadata.h:
	* src/file-manager/fm-desktop-icon-view.c:
	(fm_desktop_icon_view_init):
	* src/file-manager/fm-directory-view.c: (new_folder_done),
	(file_changed_callback):
	* src/file-manager/fm-icon-view.c: (should_show_file_on_screen),
	(fm_icon_view_remove_file), (fm_icon_view_add_file),
	(fm_icon_view_file_changed), (fm_icon_view_filter_by_screen),
	(fm_icon_view_instance_init):
	* src/file-manager/fm-icon-view.h:

	Make the desktop icon view store the screen number with the icon
	positions.  Now, a given icon appears on one screen only, and you
	can drag them between screens, etc.

1 files changed, 5 insertions, 1 deletions

diff --git a/libnautilus-private/nautilus-file-changes-queue.c b/libnautilus-private/nautilus-file-changes-queue.c
index d85649b36..09b23563c 100644
--- a/libnautilus-private/nautilus-file-changes-queue.c
+++ b/libnautilus-private/nautilus-file-changes-queue.c
@@ -52,6 +52,7 @@ typedef struct {
 	char *from_uri;
 	char *to_uri;
 	GdkPoint point;
+	int screen;
 } NautilusFileChange;
 
 typedef struct {
@@ -242,7 +243,8 @@ nautilus_file_changes_queue_schedule_metadata_remove (const char *uri)
 
 void
 nautilus_file_changes_queue_schedule_position_set (const char *uri, 
-						   GdkPoint point)
+						   GdkPoint point,
+						   int screen)
 {
 	NautilusFileChange *new_item;
 	NautilusFileChangesQueue *queue;
@@ -253,6 +255,7 @@ nautilus_file_changes_queue_schedule_position_set (const char *uri,
 	new_item->kind = CHANGE_POSITION_SET;
 	new_item->from_uri = g_strdup (uri);
 	new_item->point = point;
+	new_item->screen = screen;
 	nautilus_file_changes_queue_add_common (queue, new_item);
 }
 
@@ -529,6 +532,7 @@ nautilus_file_changes_consume_changes (gboolean consume_all)
 			position_set->uri = change->from_uri;
 			position_set->set = TRUE;
 			position_set->point = change->point;
+			position_set->screen = change->screen;
 			position_set_requests = g_list_prepend (position_set_requests,
 								position_set);
 			break;