Remove all traces of former nautilus metadata code

1 files changed, 3 insertions, 79 deletions

diff --git a/libnautilus-private/nautilus-file-changes-queue.c b/libnautilus-private/nautilus-file-changes-queue.c
index 13afaed96..f40a608b5 100644
--- a/libnautilus-private/nautilus-file-changes-queue.c
+++ b/libnautilus-private/nautilus-file-changes-queue.c
@@ -40,9 +40,6 @@ typedef enum {
 	CHANGE_FILE_CHANGED,
 	CHANGE_FILE_REMOVED,
 	CHANGE_FILE_MOVED,
-	CHANGE_METADATA_COPIED,
-	CHANGE_METADATA_MOVED,
-	CHANGE_METADATA_REMOVED,
 	CHANGE_POSITION_SET,
 	CHANGE_POSITION_REMOVE
 } NautilusFileChangeKind;
@@ -201,52 +198,6 @@ nautilus_file_changes_queue_file_moved (GFile *from,
 }
 
 void
-nautilus_file_changes_queue_schedule_metadata_copy (GFile *from,
-						    GFile *to)
-{
-	NautilusFileChange *new_item;
-	NautilusFileChangesQueue *queue;
-
-	queue = nautilus_file_changes_queue_get ();
-
-	new_item = g_new (NautilusFileChange, 1);
-	new_item->kind = CHANGE_METADATA_COPIED;
-	new_item->from = g_object_ref (from);
-	new_item->to = g_object_ref (to);
-	nautilus_file_changes_queue_add_common (queue, new_item);
-}
-
-void
-nautilus_file_changes_queue_schedule_metadata_move (GFile      *from,
-						    GFile      *to)
-{
-	NautilusFileChange *new_item;
-	NautilusFileChangesQueue *queue;
-
-	queue = nautilus_file_changes_queue_get ();
-
-	new_item = g_new (NautilusFileChange, 1);
-	new_item->kind = CHANGE_METADATA_MOVED;
-	new_item->from = g_object_ref (from);
-	new_item->to = g_object_ref (to);
-	nautilus_file_changes_queue_add_common (queue, new_item);
-}
-
-void
-nautilus_file_changes_queue_schedule_metadata_remove (GFile *location)
-{
-	NautilusFileChange *new_item;
-	NautilusFileChangesQueue *queue;
-
-	queue = nautilus_file_changes_queue_get ();
-
-	new_item = g_new (NautilusFileChange, 1);
-	new_item->kind = CHANGE_METADATA_REMOVED;
-	new_item->from = g_object_ref (location);
-	nautilus_file_changes_queue_add_common (queue, new_item);
-}
-
-void
 nautilus_file_changes_queue_schedule_position_set (GFile *location, 
 						   GdkPoint point,
 						   int screen)
@@ -386,7 +337,6 @@ nautilus_file_changes_consume_changes (gboolean consume_all)
 		} else {
 			flush_needed = additions != NULL
 				&& change->kind != CHANGE_FILE_ADDED
-				&& change->kind != CHANGE_METADATA_COPIED
 				&& change->kind != CHANGE_POSITION_SET
 				&& change->kind != CHANGE_POSITION_REMOVE;
 			
@@ -395,37 +345,30 @@ nautilus_file_changes_consume_changes (gboolean consume_all)
 			
 			flush_needed |= moves != NULL
 				&& change->kind != CHANGE_FILE_MOVED
-				&& change->kind != CHANGE_METADATA_MOVED
 				&& change->kind != CHANGE_POSITION_SET
 				&& change->kind != CHANGE_POSITION_REMOVE;
 			
 			flush_needed |= deletions != NULL
-				&& change->kind != CHANGE_FILE_REMOVED
-				&& change->kind != CHANGE_METADATA_REMOVED;
+				&& change->kind != CHANGE_FILE_REMOVED;
 			
 			flush_needed |= metadata_copy_requests != NULL
 				&& change->kind != CHANGE_FILE_ADDED
-				&& change->kind != CHANGE_METADATA_COPIED
 				&& change->kind != CHANGE_POSITION_SET
 				&& change->kind != CHANGE_POSITION_REMOVE;
 			
 			flush_needed |= metadata_move_requests != NULL
 				&& change->kind != CHANGE_FILE_MOVED
-				&& change->kind != CHANGE_METADATA_MOVED
 				&& change->kind != CHANGE_POSITION_SET
 				&& change->kind != CHANGE_POSITION_REMOVE;
 			
 			flush_needed |= metadata_remove_requests != NULL
-				&& change->kind != CHANGE_FILE_REMOVED
-				&& change->kind != CHANGE_METADATA_REMOVED;
+				&& change->kind != CHANGE_FILE_REMOVED;
 	
 			flush_needed |= position_set_requests != NULL
 				&& change->kind != CHANGE_POSITION_SET
 				&& change->kind != CHANGE_POSITION_REMOVE
 				&& change->kind != CHANGE_FILE_ADDED
-				&& change->kind != CHANGE_FILE_MOVED
-				&& change->kind != CHANGE_METADATA_COPIED
-				&& change->kind != CHANGE_METADATA_MOVED;
+				&& change->kind != CHANGE_FILE_MOVED;
 			
 			flush_needed |= !consume_all && chunk_count >= CONSUME_CHANGES_MAX_CHUNK;
 				/* we have reached the chunk maximum */
@@ -513,25 +456,6 @@ nautilus_file_changes_consume_changes (gboolean consume_all)
 			moves = g_list_prepend (moves, pair);
 			break;
 
-		case CHANGE_METADATA_COPIED:
-			pair = g_new (GFilePair, 1);
-			pair->from = change->from;
-			pair->to = change->to;
-			metadata_copy_requests = g_list_prepend (metadata_copy_requests, pair);
-			break;
-
-		case CHANGE_METADATA_MOVED:
-			pair = g_new (GFilePair, 1);
-			pair->from = change->from;
-			pair->to = change->to;
-			metadata_move_requests = g_list_prepend (metadata_move_requests, pair);
-			break;
-
-		case CHANGE_METADATA_REMOVED:
-			metadata_remove_requests = g_list_prepend (metadata_remove_requests, 
-				change->from);
-			break;
-
 		case CHANGE_POSITION_SET:
 			position_set = g_new (NautilusFileChangesQueuePosition, 1);
 			position_set->location = change->from;