[nautilus] Remove all traces of former nautilus metadata code

From: Alexander Larsson <alexl src gnome org>
To: svn-commits-list gnome org
Subject: [nautilus] Remove all traces of former nautilus metadata code
Date: Tue, 23 Jun 2009 15:47:07 -0400 (EDT)
commit 37be3809bc0d25d28298b38bc0b893a6fd3a665f
Author: Alexander Larsson <alexl redhat com>
Date:   Tue Jun 23 21:43:52 2009 +0200

    Remove all traces of former nautilus metadata code

 libnautilus-private/Makefile.am                    |    4 -
 libnautilus-private/nautilus-directory-async.c     |   82 -
 .../nautilus-directory-background.c                |    2 +-
 libnautilus-private/nautilus-directory-metafile.c  |  363 ----
 libnautilus-private/nautilus-directory-metafile.h  |   81 -
 libnautilus-private/nautilus-directory-private.h   |    6 -
 libnautilus-private/nautilus-directory.c           |  174 --
 libnautilus-private/nautilus-file-attributes.h     |   13 +-
 libnautilus-private/nautilus-file-changes-queue.c  |   82 +-
 libnautilus-private/nautilus-file-changes-queue.h  |    5 -
 libnautilus-private/nautilus-file-operations.c     |   17 -
 libnautilus-private/nautilus-file-utilities.c      |    1 -
 libnautilus-private/nautilus-file.c                |   24 +-
 libnautilus-private/nautilus-file.h                |    2 +-
 libnautilus-private/nautilus-link.c                |    1 -
 libnautilus-private/nautilus-metafile.c            | 2054 --------------------
 libnautilus-private/nautilus-metafile.h            |   88 -
 libnautilus-private/nautilus-mime-actions.c        |    3 +-
 src/file-manager/fm-directory-view.c               |    2 -
 src/file-manager/fm-properties-window.c            |    2 +-
 src/nautilus-main.c                                |    1 -
 src/nautilus-notes-viewer.c                        |    2 +-
 src/nautilus-sidebar-title.c                       |    2 +-
 src/nautilus-window-manage-views.c                 |    6 +-
 test/test-nautilus-directory-async.c               |    2 +-
 25 files changed, 24 insertions(+), 2995 deletions(-)
---
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 51bb759..e831d43 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -75,8 +75,6 @@ libnautilus_private_la_SOURCES = \
 	nautilus-directory-async.c \
 	nautilus-directory-background.c \
 	nautilus-directory-background.h \
-	nautilus-directory-metafile.c \
-	nautilus-directory-metafile.h \
 	nautilus-directory-notify.h \
 	nautilus-directory-private.h \
 	nautilus-directory.c \
@@ -130,8 +128,6 @@ libnautilus_private_la_SOURCES = \
 	nautilus-merged-directory.h \
 	nautilus-metadata.h \
 	nautilus-metadata.c \
-	nautilus-metafile.c \
-	nautilus-metafile.h \
 	nautilus-mime-actions.c \
 	nautilus-mime-actions.h \
 	nautilus-mime-application-chooser.c \
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index f40421e..653fd30 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -24,7 +24,6 @@
 
 #include <config.h>
 
-#include "nautilus-directory-metafile.h"
 #include "nautilus-directory-notify.h"
 #include "nautilus-directory-private.h"
 #include "nautilus-file-attributes.h"
@@ -34,7 +33,6 @@
 #include "nautilus-global-preferences.h"
 #include "nautilus-link.h"
 #include "nautilus-marshal.h"
-#include "nautilus-metafile.h"
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-string.h>
 #include <gtk/gtk.h>
@@ -663,10 +661,6 @@ nautilus_directory_set_up_request (NautilusFileAttributes file_attributes)
 		REQUEST_SET_TYPE (request, REQUEST_FILE_INFO);
 	}
 
-	if ((file_attributes & NAUTILUS_FILE_ATTRIBUTE_METADATA) != 0) {
-		REQUEST_SET_TYPE (request, REQUEST_METAFILE);
-	}
-	
 	if ((file_attributes & NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO) != 0) {
 		REQUEST_SET_TYPE (request, REQUEST_EXTENSION_INFO);
 	}
@@ -698,7 +692,6 @@ mime_db_changed_callback (GObject *ignore, NautilusDirectory *dir)
 
 	attrs = NAUTILUS_FILE_ATTRIBUTE_INFO |
 		NAUTILUS_FILE_ATTRIBUTE_LINK_INFO |
-		NAUTILUS_FILE_ATTRIBUTE_METADATA |
 		NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_MIME_TYPES;
 
 	nautilus_directory_force_reload_internal (dir, attrs);
@@ -753,13 +746,6 @@ nautilus_directory_monitor_add_internal (NautilusDirectory *directory,
 		directory->details->monitor = nautilus_monitor_directory (directory->details->location);
 	}
 	
-	/* We could just call update_metadata_monitors here, but we can be smarter
-	 * since we know what monitor was just added.
-	 */
-	if (REQUEST_WANTS_TYPE (monitor->request, REQUEST_METAFILE) &&
-	    !directory->details->metafile_monitored) {
-		nautilus_directory_register_metadata_monitor (directory);	
-	}
 
 	if (REQUEST_WANTS_TYPE (monitor->request, REQUEST_FILE_INFO) &&
 	    directory->details->mime_db_monitor == 0) {
@@ -1119,39 +1105,6 @@ directory_load_done (NautilusDirectory *directory,
 	directory_load_cancel (directory);
 }
 
-/* This checks if there's a request for the metafile contents. */
-static gboolean
-is_anyone_waiting_for_metafile (NautilusDirectory *directory)
-{
-	if (directory->details->call_when_ready_counters[REQUEST_METAFILE] > 0) {
-		return TRUE;
-	}
-
-	if (directory->details->monitor_counters[REQUEST_METAFILE] > 0) {
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-update_metadata_monitors (NautilusDirectory *directory)
-{
-	gboolean is_metadata_monitored;
-	
-	is_metadata_monitored = is_anyone_waiting_for_metafile (directory);
-	
-	if (!directory->details->metafile_monitored) {
-		if (is_metadata_monitored) {
-			nautilus_directory_register_metadata_monitor (directory);
-		}
-	} else {
-		if (!is_metadata_monitored) {
-			nautilus_directory_unregister_metadata_monitor (directory);
-		}
-	}
-}
-
 void
 nautilus_directory_monitor_remove_internal (NautilusDirectory *directory,
 					    NautilusFile *file,
@@ -1169,8 +1122,6 @@ nautilus_directory_monitor_remove_internal (NautilusDirectory *directory,
 		directory->details->monitor = NULL;
 	}
 
-	update_metadata_monitors (directory);
-
 	/* XXX - do we need to remove anything from the work queue? */
 
 	nautilus_directory_async_state_changed (directory);
@@ -1200,8 +1151,6 @@ nautilus_directory_remove_file_monitors (NautilusDirectory *directory,
 		}
 	}
 
-	update_metadata_monitors (directory);
-
 	/* XXX - do we need to remove anything from the work queue? */
 
 	nautilus_directory_async_state_changed (directory);
@@ -1229,7 +1178,6 @@ nautilus_directory_add_file_monitors (NautilusDirectory *directory,
 
 	nautilus_directory_add_file_to_work_queue (directory, file);
 
-	update_metadata_monitors (directory);
 	nautilus_directory_async_state_changed (directory);
 }
 
@@ -1374,15 +1322,6 @@ nautilus_directory_call_when_ready_internal (NautilusDirectory *directory,
 	request_counter_add_request (directory->details->call_when_ready_counters,
 				     callback.request);
 
-	/* When we change the ready list we need to sync up metadata monitors.
-	 * We could just call update_metadata_monitors here, but we can be smarter
-	 * since we know what was just added.
-	 */
-	if (REQUEST_WANTS_TYPE (callback.request, REQUEST_METAFILE) &&
-	    !directory->details->metafile_monitored) {
-		nautilus_directory_register_metadata_monitor (directory);	
-	}
-
 	/* Put the callback file or all the files on the work queue. */
 	if (file != NULL) {
 		nautilus_directory_add_file_to_work_queue (directory, file);
@@ -1468,8 +1407,6 @@ nautilus_directory_cancel_callback_internal (NautilusDirectory *directory,
 					   ready_callback_key_compare);
 		if (node != NULL) {
 			remove_callback_link (directory, node);
-			/* When we change the ready list we need to sync up metadata monitors. */
-			update_metadata_monitors (directory);
 			
 			nautilus_directory_async_state_changed (directory);
 		}
@@ -1599,11 +1536,6 @@ nautilus_async_destroying_file (NautilusFile *file)
 		}
 	}
 
-	/* When we change the monitor or ready list we need to sync up metadata monitors */
-	if (changed) {
-		update_metadata_monitors (directory);
-	}
-
 	/* Check if it's a file that's currently being worked on.
 	 * If so, make that NULL so it gets canceled right away.
 	 */
@@ -1799,11 +1731,6 @@ request_is_satisfied (NautilusDirectory *directory,
 		      NautilusFile *file,
 		      Request request)
 {
-	if (REQUEST_WANTS_TYPE (request, REQUEST_METAFILE) &&
-	    !nautilus_directory_is_metadata_read (directory)) {
-		return FALSE;
-	}
-
 	if (REQUEST_WANTS_TYPE (request, REQUEST_FILE_LIST) &&
 	    !(directory->details->directory_loaded &&
 				    directory->details->directory_loaded_sent_notification)) {
@@ -1909,9 +1836,6 @@ call_ready_callbacks_at_idle (gpointer callback_data)
 		g_free (callback);
 	}
 
-	/* When we change the ready list we need to sync up metadata monitors. */
-	update_metadata_monitors (directory);
-
 	nautilus_directory_async_state_changed (directory);
 
 	nautilus_directory_unref (directory);
@@ -4822,9 +4746,6 @@ cancel_loading_attributes (NautilusDirectory *directory,
 		mount_cancel (directory);
 	}
 	
-	/* FIXME bugzilla.gnome.org 45064: implement cancelling metadata when we
-	   implement invalidating metadata */
-
 	nautilus_directory_async_state_changed (directory);
 }
 
@@ -4867,9 +4788,6 @@ nautilus_directory_cancel_loading_file_attributes (NautilusDirectory      *direc
 		cancel_mount_for_file (directory, file);
 	}
 
-	/* FIXME bugzilla.gnome.org 45064: implement cancelling metadata when we
-	   implement invalidating metadata */
-
 	nautilus_directory_async_state_changed (directory);
 }
 
diff --git a/libnautilus-private/nautilus-directory-background.c b/libnautilus-private/nautilus-directory-background.c
index 08503d6..0d7b88e 100644
--- a/libnautilus-private/nautilus-directory-background.c
+++ b/libnautilus-private/nautilus-directory-background.c
@@ -653,7 +653,7 @@ nautilus_connect_background_to_file_metadata (GtkWidget    *widget,
 		/* arrange to receive file metadata */
 		nautilus_file_monitor_add (file,
                                            background,
-                                           NAUTILUS_FILE_ATTRIBUTE_METADATA);
+                                           NAUTILUS_FILE_ATTRIBUTE_INFO);
 
 		/* arrange for notification when the theme changes */
 		eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME,
diff --git a/libnautilus-private/nautilus-directory-private.h b/libnautilus-private/nautilus-directory-private.h
index f8a26e3..be1f73b 100644
--- a/libnautilus-private/nautilus-directory-private.h
+++ b/libnautilus-private/nautilus-directory-private.h
@@ -27,7 +27,6 @@
 #include <libnautilus-private/nautilus-directory.h>
 #include <libnautilus-private/nautilus-file-queue.h>
 #include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-metafile.h>
 #include <libnautilus-private/nautilus-monitor.h>
 #include <libnautilus-private/nautilus-idle-queue.h>
 #include <libnautilus-extension/nautilus-info-provider.h>
@@ -52,7 +51,6 @@ typedef enum {
 	REQUEST_DIRECTORY_COUNT,
 	REQUEST_FILE_INFO,
 	REQUEST_FILE_LIST, /* always FALSE if file != NULL */
-	REQUEST_METAFILE,
 	REQUEST_MIME_LIST,
 	REQUEST_TOP_LEFT_TEXT,
 	REQUEST_LARGE_TOP_LEFT_TEXT,
@@ -97,10 +95,6 @@ struct NautilusDirectoryDetails
 	NautilusMonitor *monitor;
 	gulong 		 mime_db_monitor;
 
-	NautilusIdleQueue *idle_queue;
-	gboolean metafile_monitored;
-	NautilusMetafile *metafile;
-
 	gboolean in_async_service_loop;
 	gboolean state_changed;
 
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index 1111698..f953839 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -25,7 +25,6 @@
 #include <config.h>
 #include "nautilus-directory-private.h"
 
-#include "nautilus-directory-metafile.h"
 #include "nautilus-directory-notify.h"
 #include "nautilus-file-attributes.h"
 #include "nautilus-file-private.h"
@@ -35,7 +34,6 @@
 #include "nautilus-lib-self-check-functions.h"
 #include "nautilus-marshal.h"
 #include "nautilus-metadata.h"
-#include "nautilus-metafile.h"
 #include "nautilus-desktop-directory.h"
 #include "nautilus-vfs-directory.h"
 #include <eel/eel-glib-extensions.h>
@@ -53,14 +51,6 @@ enum {
 
 static guint signals[LAST_SIGNAL];
 
-/* Specifications for parallel-directory metafile. */
-#define METAFILES_DIRECTORY_NAME "metafiles"
-#define METAFILE_SUFFIX ".xml"
-#define METAFILES_DIRECTORY_PERMISSIONS  \
-	(S_IRUSR | S_IWUSR | S_IXUSR |   \
-	 S_IRGRP | S_IWGRP | S_IXGRP |   \
-	 S_IROTH | S_IWOTH | S_IXOTH)
-
 static GHashTable *directories;
 
 static void               nautilus_directory_finalize         (GObject                *object);
@@ -139,7 +129,6 @@ nautilus_directory_init (gpointer object, gpointer klass)
 	directory->details->high_priority_queue = nautilus_file_queue_new ();
 	directory->details->low_priority_queue = nautilus_file_queue_new ();
 	directory->details->extension_queue = nautilus_file_queue_new ();
-	directory->details->idle_queue = nautilus_idle_queue_new ();
 	directory->details->free_space = (guint64)-1;
 }
 
@@ -190,14 +179,6 @@ nautilus_directory_finalize (GObject *object)
 		nautilus_monitor_cancel (directory->details->monitor);
 	}
 
-	if (directory->details->metafile_monitored) {
-		nautilus_directory_unregister_metadata_monitor (directory);
-	}
-
-	if (directory->details->metafile != NULL) {
-		g_object_unref (directory->details->metafile);
-	}
-
 	if (directory->details->dequeue_pending_idle_id != 0) {
 		g_source_remove (directory->details->dequeue_pending_idle_id);
 	}
@@ -220,7 +201,6 @@ nautilus_directory_finalize (GObject *object)
 	nautilus_file_queue_destroy (directory->details->high_priority_queue);
 	nautilus_file_queue_destroy (directory->details->low_priority_queue);
 	nautilus_file_queue_destroy (directory->details->extension_queue);
-	nautilus_idle_queue_destroy (directory->details->idle_queue);
 	g_assert (directory->details->directory_load_in_progress == NULL);
 	g_assert (directory->details->count_in_progress == NULL);
 	g_assert (directory->details->dequeue_pending_idle_id == 0);
@@ -1197,8 +1177,6 @@ static void
 change_directory_location (NautilusDirectory *directory,
 			   GFile *new_location)
 {
-	char *new_uri;
-	
 	/* I believe it's impossible for a self-owned file/directory
 	 * to be moved. But if that did somehow happen, this function
 	 * wouldn't do enough to handle it.
@@ -1213,10 +1191,6 @@ change_directory_location (NautilusDirectory *directory,
 	g_hash_table_insert (directories,
 			     directory->details->location,
 			     directory);
-
-	new_uri = g_file_get_uri (new_location);
-	nautilus_directory_rename_directory_metadata (directory, new_uri);
-	g_free (new_uri);
 }
 
 typedef struct {
@@ -1464,125 +1438,6 @@ nautilus_directory_notify_files_moved_by_uri (GList *uri_pairs)
 	g_list_free (file_pairs);
 }
 
-void 
-nautilus_directory_schedule_metadata_copy (GList *file_pairs)
-{
-	GList *p;
-	GFilePair *pair;
-	NautilusDirectory *source_directory, *destination_directory;
-	char *source_basename, *destination_basename;
-
-	for (p = file_pairs; p != NULL; p = p->next) {
-		pair = p->data;
-
-		source_directory = get_parent_directory (pair->from);
-		destination_directory = get_parent_directory (pair->to);
-
-		source_basename = g_file_get_basename (pair->from);
-		destination_basename = g_file_get_basename (pair->to);
-		
-		if (source_directory != NULL && destination_directory != NULL) {
-			nautilus_directory_copy_file_metadata (source_directory,
-							       source_basename,
-							       destination_directory,
-							       destination_basename);
-		}
-
-		g_free (source_basename);
-		g_free (destination_basename);
-		
-		nautilus_directory_unref (source_directory);
-		nautilus_directory_unref (destination_directory);
-	}
-}
-
-void 
-nautilus_directory_schedule_metadata_copy_by_uri (GList *uri_pairs)
-{
-	GList *file_pairs;
-
-	file_pairs = uri_pairs_to_file_pairs (uri_pairs);
-	nautilus_directory_schedule_metadata_copy (file_pairs);
-	g_list_foreach (file_pairs, (GFunc)g_file_pair_free, NULL);
-	g_list_free (file_pairs);
-}
-
-
-void 
-nautilus_directory_schedule_metadata_move (GList *file_pairs)
-{
-	GList *p;
-	GFilePair *pair;
-	NautilusDirectory *source_directory, *destination_directory;
-	char *source_basename, *destination_basename;
-
-	for (p = file_pairs; p != NULL; p = p->next) {
-		pair = p->data;
-
-		source_directory = get_parent_directory (pair->from);
-		destination_directory = get_parent_directory (pair->to);
-		
-		source_basename = g_file_get_basename (pair->from);
-		destination_basename = g_file_get_basename (pair->to);
-		
-		nautilus_directory_copy_file_metadata (source_directory,
-						       source_basename,
-						       destination_directory,
-						       destination_basename);
-		nautilus_directory_remove_file_metadata (source_directory,
-							 source_basename);
-		
-		g_free (source_basename);
-		g_free (destination_basename);
-		
-		nautilus_directory_unref (source_directory);
-		nautilus_directory_unref (destination_directory);
-	}
-}
-
-void 
-nautilus_directory_schedule_metadata_move_by_uri (GList *uri_pairs)
-{
-	GList *file_pairs;
-
-	file_pairs = uri_pairs_to_file_pairs (uri_pairs);
-	nautilus_directory_schedule_metadata_move (file_pairs);
-	g_list_foreach (file_pairs, (GFunc)g_file_pair_free, NULL);
-	g_list_free (file_pairs);
-}
-
-void 
-nautilus_directory_schedule_metadata_remove (GList *files)
-{
-	GList *p;
-	NautilusDirectory *directory;
-	char *basename;
-	GFile *location;
-
-	for (p = files; p != NULL; p = p->next) {
-		location = p->data;
-
-		directory = get_parent_directory (location);
-
-		basename = g_file_get_basename (location);
-		nautilus_directory_remove_file_metadata (directory, basename);
-		g_free (basename);
-
-		
-		nautilus_directory_unref (directory);
-	}
-}
-
-void 
-nautilus_directory_schedule_metadata_remove_by_uri (GList *uris)
-{
-	GList *files;
-
-	files = nautilus_file_list_from_uris (uris);
-	nautilus_directory_schedule_metadata_remove (files);
-	eel_g_object_list_free (files);
-}
-
 void
 nautilus_directory_schedule_position_set (GList *position_setting_list)
 {
@@ -1937,19 +1792,9 @@ nautilus_directory_is_desktop_directory (NautilusDirectory   *directory)
 #include "nautilus-file-attributes.h"
 
 static int data_dummy;
-static gboolean got_metadata_flag;
 static gboolean got_files_flag;
 
 static void
-got_metadata_callback (NautilusDirectory *directory, GList *files, gpointer callback_data)
-{
-	g_assert (NAUTILUS_IS_DIRECTORY (directory));
-	g_assert (callback_data == &data_dummy);
-
-	got_metadata_flag = TRUE;
-}
-
-static void
 got_files_callback (NautilusDirectory *directory, GList *files, gpointer callback_data)
 {
 	g_assert (NAUTILUS_IS_DIRECTORY (directory));
@@ -1981,15 +1826,6 @@ nautilus_self_check_directory (void)
 		(directory, &data_dummy,
 		 TRUE, TRUE, 0, NULL, NULL);
 
-	got_metadata_flag = FALSE;
-
-	nautilus_directory_call_when_ready (directory, NAUTILUS_FILE_ATTRIBUTE_METADATA, TRUE,
-					    got_metadata_callback, &data_dummy);
-
-	while (!got_metadata_flag) {
-		gtk_main_iteration ();
-	}
-
 	nautilus_file_set_metadata (file, "test", "default", "value");
 	EEL_CHECK_STRING_RESULT (nautilus_file_get_metadata (file, "test", "default"), "value");
 
@@ -2031,16 +1867,6 @@ nautilus_self_check_directory (void)
 
 	directory = nautilus_directory_get_by_uri ("file:///etc");
 
-	got_metadata_flag = FALSE;
-	nautilus_directory_call_when_ready (directory, NAUTILUS_FILE_ATTRIBUTE_METADATA, TRUE,
-					    got_metadata_callback, &data_dummy);
-
-	while (!got_metadata_flag) {
-		gtk_main_iteration ();
-	}
-
-	EEL_CHECK_BOOLEAN_RESULT (nautilus_directory_is_metadata_read (directory), TRUE);
-
 	got_files_flag = FALSE;
 
 	nautilus_directory_call_when_ready (directory,
diff --git a/libnautilus-private/nautilus-file-attributes.h b/libnautilus-private/nautilus-file-attributes.h
index 5a7d215..fee97b9 100644
--- a/libnautilus-private/nautilus-file-attributes.h
+++ b/libnautilus-private/nautilus-file-attributes.h
@@ -35,13 +35,12 @@ typedef enum {
 	NAUTILUS_FILE_ATTRIBUTE_DEEP_COUNTS = 1 << 2,
 	NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT = 1 << 3,
 	NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_MIME_TYPES = 1 << 4,
-	NAUTILUS_FILE_ATTRIBUTE_METADATA = 1 << 5,
-	NAUTILUS_FILE_ATTRIBUTE_TOP_LEFT_TEXT = 1 << 6,
-	NAUTILUS_FILE_ATTRIBUTE_LARGE_TOP_LEFT_TEXT = 1 << 7,
-	NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO = 1 << 8,
-	NAUTILUS_FILE_ATTRIBUTE_THUMBNAIL = 1 << 9,
-	NAUTILUS_FILE_ATTRIBUTE_MOUNT = 1 << 10,
-	NAUTILUS_FILE_ATTRIBUTE_FILESYSTEM_INFO = 1 << 11,
+	NAUTILUS_FILE_ATTRIBUTE_TOP_LEFT_TEXT = 1 << 5,
+	NAUTILUS_FILE_ATTRIBUTE_LARGE_TOP_LEFT_TEXT = 1 << 6,
+	NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO = 1 << 7,
+	NAUTILUS_FILE_ATTRIBUTE_THUMBNAIL = 1 << 8,
+	NAUTILUS_FILE_ATTRIBUTE_MOUNT = 1 << 9,
+	NAUTILUS_FILE_ATTRIBUTE_FILESYSTEM_INFO = 1 << 10,
 } NautilusFileAttributes;
 
 #endif /* NAUTILUS_FILE_ATTRIBUTES_H */
diff --git a/libnautilus-private/nautilus-file-changes-queue.c b/libnautilus-private/nautilus-file-changes-queue.c
index 13afaed..f40a608 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;
diff --git a/libnautilus-private/nautilus-file-changes-queue.h b/libnautilus-private/nautilus-file-changes-queue.h
index 31f2540..5c430c7 100644
--- a/libnautilus-private/nautilus-file-changes-queue.h
+++ b/libnautilus-private/nautilus-file-changes-queue.h
@@ -31,11 +31,6 @@ void nautilus_file_changes_queue_file_changed                    (GFile      *lo
 void nautilus_file_changes_queue_file_removed                    (GFile      *location);
 void nautilus_file_changes_queue_file_moved                      (GFile      *from,
 								  GFile      *to);
-void nautilus_file_changes_queue_schedule_metadata_copy          (GFile      *from,
-								  GFile      *to);
-void nautilus_file_changes_queue_schedule_metadata_move          (GFile      *from,
-								  GFile      *to);
-void nautilus_file_changes_queue_schedule_metadata_remove        (GFile      *location);
 void nautilus_file_changes_queue_schedule_position_set           (GFile      *location,
 								  GdkPoint    point,
 								  int         screen);
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index d1a92f1..9d2d792 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -1573,9 +1573,6 @@ delete_dir (CommonJob *job, GFile *dir,
 		skip:
 			g_error_free (error);
 		} else {
-			if (toplevel) {
-				nautilus_file_changes_queue_schedule_metadata_remove (dir);
-			}
 			nautilus_file_changes_queue_file_removed (dir);
 			transfer_info->num_files ++;
 			report_delete_progress (job, source_info, transfer_info);
@@ -1606,9 +1603,6 @@ delete_file (CommonJob *job, GFile *file,
 	
 	error = NULL;
 	if (g_file_delete (file, job->cancellable, &error)) {
-		if (toplevel) {
-			nautilus_file_changes_queue_schedule_metadata_remove (file);
-		}
 		nautilus_file_changes_queue_file_removed (file);
 		transfer_info->num_files ++;
 		report_delete_progress (job, source_info, transfer_info);
@@ -1797,7 +1791,6 @@ trash_files (CommonJob *job, GList *files, int *files_skipped)
 			g_error_free (error);
 			total_files--;
 		} else {
-			nautilus_file_changes_queue_schedule_metadata_remove (file);
 			nautilus_file_changes_queue_file_removed (file);
 			
 			files_trashed++;
@@ -3643,7 +3636,6 @@ remove_target_recursively (CommonJob *job,
 		return FALSE;
 	}
 	nautilus_file_changes_queue_file_removed (file);
-	nautilus_file_changes_queue_schedule_metadata_remove (file);
 	
 	return TRUE;
 	
@@ -3927,11 +3919,6 @@ copy_move_file (CopyMoveJob *copy_job,
 		report_copy_progress (copy_job, source_info, transfer_info);
 
 		if (debuting_files) {
-			if (copy_job->is_move) {
-				nautilus_file_changes_queue_schedule_metadata_move (src, dest);
-			} else {
-				nautilus_file_changes_queue_schedule_metadata_copy (src, dest);
-			}
 			if (position) {
 				nautilus_file_changes_queue_schedule_position_set (dest, *position, job->screen_num);
 			} else {
@@ -4139,9 +4126,6 @@ copy_move_file (CopyMoveJob *copy_job,
 				g_error_free (error);
 				error = NULL;
 			}
-			if (debuting_files) { /* Only remove metadata for toplevel items */
-				nautilus_file_changes_queue_schedule_metadata_remove (dest);
-			}
 			nautilus_file_changes_queue_file_removed (dest);
 		}
 
@@ -4555,7 +4539,6 @@ move_file_prepare (CopyMoveJob *move_job,
 		}
 		
 		nautilus_file_changes_queue_file_moved (src, dest);
-		nautilus_file_changes_queue_schedule_metadata_move (src, dest);
 		if (position) {
 			nautilus_file_changes_queue_schedule_position_set (dest, *position, job->screen_num);
 		} else {
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index 022dbd0..9f60dd3 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -28,7 +28,6 @@
 #include "nautilus-global-preferences.h"
 #include "nautilus-lib-self-check-functions.h"
 #include "nautilus-metadata.h"
-#include "nautilus-metafile.h"
 #include "nautilus-file.h"
 #include "nautilus-search-directory.h"
 #include "nautilus-signaller.h"
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index a703b68..235e26a 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -25,7 +25,6 @@
 #include <config.h>
 #include "nautilus-file.h"
 
-#include "nautilus-directory-metafile.h"
 #include "nautilus-directory-notify.h"
 #include "nautilus-directory-private.h"
 #include "nautilus-signaller.h"
@@ -91,9 +90,6 @@
 #define SORT_LAST_CHAR1 '.'
 #define SORT_LAST_CHAR2 '#'
 
-/* Name to use to tag metadata for the directory itself. */
-#define FILE_NAME_FOR_DIRECTORY_METADATA "."
-
 /* Name of Nautilus trash directories */
 #define TRASH_DIRECTORY_NAME ".Trash"
 
@@ -1452,15 +1448,6 @@ rename_get_info_callback (GObject *source_object,
 		
 		update_info_and_name (op->file, new_info);
 		
-		/* Self-owned files store their metadata under the
-		 * hard-code name "."  so there's no need to rename
-		 * their metadata when they are renamed.
-		 */
-		if (!nautilus_file_is_self_owned (op->file)) {
-			nautilus_directory_rename_file_metadata
-				(directory, old_name, eel_ref_str_peek (op->file->details->name));
-		}
-		
 		g_free (old_name);
 		
 		new_uri = nautilus_file_get_uri (op->file);
@@ -3241,7 +3228,9 @@ set_metadata_get_info_callback (GObject *source_object,
 	error = NULL;
 	new_info = g_file_query_info_finish (G_FILE (source_object), res, &error);
 	if (new_info != NULL) {
-		nautilus_file_update_info (file, new_info);
+		if (nautilus_file_update_info (file, new_info)) {
+			nautilus_file_changed (file);
+		}
 		g_object_unref (new_info);
 	}
 	nautilus_file_unref (file);
@@ -3307,7 +3296,6 @@ nautilus_file_set_metadata (NautilusFile *file,
 		val = "<null>";
 	}
 
-	g_print ("setting key %s to %s\n", key, val);
 	gio_key = g_strconcat ("metadata::", key, NULL);
 	g_file_info_set_attribute_string (info, gio_key, val);
 	g_free (gio_key);
@@ -3349,7 +3337,6 @@ nautilus_file_set_metadata_list (NautilusFile *file,
 	}
 	val[i] = NULL;
 
-	g_print ("setting list key %s to %d items\n", key, len);
 	gio_key = g_strconcat ("metadata::", key, NULL);
 	g_file_info_set_attribute_stringv (info, gio_key, val);
 	g_free (gio_key);
@@ -4681,7 +4668,9 @@ set_attributes_get_info_callback (GObject *source_object,
 	error = NULL;
 	new_info = g_file_query_info_finish (G_FILE (source_object), res, &error);
 	if (new_info != NULL) {
-		nautilus_file_update_info (op->file, new_info);
+		if (nautilus_file_update_info (op->file, new_info)) {
+			nautilus_file_changed (op->file);
+		}
 		g_object_unref (new_info);
 	}
 	nautilus_file_operation_complete (op, NULL, error);
@@ -7208,7 +7197,6 @@ nautilus_file_get_all_attributes (void)
 		NAUTILUS_FILE_ATTRIBUTE_DEEP_COUNTS |
 		NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT | 
 		NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_MIME_TYPES | 
-		NAUTILUS_FILE_ATTRIBUTE_METADATA | 
 		NAUTILUS_FILE_ATTRIBUTE_TOP_LEFT_TEXT | 
 		NAUTILUS_FILE_ATTRIBUTE_LARGE_TOP_LEFT_TEXT |
 		NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO |
diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h
index f984017..f3c8e99 100644
--- a/libnautilus-private/nautilus-file.h
+++ b/libnautilus-private/nautilus-file.h
@@ -105,7 +105,7 @@ typedef char * (*NautilusTruncateCallback)    (const char    *string,
 					       void	     *context);
 
 
-#define NAUTILUS_FILE_ATTRIBUTES_FOR_ICON (NAUTILUS_FILE_ATTRIBUTE_INFO | NAUTILUS_FILE_ATTRIBUTE_LINK_INFO |NAUTILUS_FILE_ATTRIBUTE_METADATA | NAUTILUS_FILE_ATTRIBUTE_THUMBNAIL)
+#define NAUTILUS_FILE_ATTRIBUTES_FOR_ICON (NAUTILUS_FILE_ATTRIBUTE_INFO | NAUTILUS_FILE_ATTRIBUTE_LINK_INFO | NAUTILUS_FILE_ATTRIBUTE_THUMBNAIL)
 
 typedef void NautilusFileListHandle;
 
diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c
index 10e830e..e3d4191 100644
--- a/libnautilus-private/nautilus-link.c
+++ b/libnautilus-private/nautilus-link.c
@@ -262,7 +262,6 @@ nautilus_link_local_create (const char     *directory_uri,
 	dummy_list.next = NULL;
 	dummy_list.prev = NULL;
 	nautilus_directory_notify_files_added (&dummy_list);
-	nautilus_directory_schedule_metadata_remove (&dummy_list);
 
 	if (point != NULL) {
 		item.location = file;
diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c
index bee21a5..6d87d7a 100644
--- a/libnautilus-private/nautilus-mime-actions.c
+++ b/libnautilus-private/nautilus-mime-actions.c
@@ -289,8 +289,7 @@ NautilusFileAttributes
 nautilus_mime_actions_get_required_file_attributes (void)
 {
 	return NAUTILUS_FILE_ATTRIBUTE_INFO |
-		NAUTILUS_FILE_ATTRIBUTE_LINK_INFO |
-		NAUTILUS_FILE_ATTRIBUTE_METADATA;
+		NAUTILUS_FILE_ATTRIBUTE_LINK_INFO;
 }
 
 static gboolean
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 129069b..ee5fde5 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -3190,7 +3190,6 @@ fm_directory_view_add_subdirectory (FMDirectoryView  *view,
 		NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT |
 		NAUTILUS_FILE_ATTRIBUTE_INFO |
 		NAUTILUS_FILE_ATTRIBUTE_LINK_INFO |
-		NAUTILUS_FILE_ATTRIBUTE_METADATA |
 		NAUTILUS_FILE_ATTRIBUTE_MOUNT |
 		NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO;
 
@@ -8940,7 +8939,6 @@ finish_loading (FMDirectoryView *view)
 		NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT |
 		NAUTILUS_FILE_ATTRIBUTE_INFO |
 		NAUTILUS_FILE_ATTRIBUTE_LINK_INFO |
-		NAUTILUS_FILE_ATTRIBUTE_METADATA |
 		NAUTILUS_FILE_ATTRIBUTE_MOUNT |
 		NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO;
 
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 9e17290..c867bc2 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -5160,7 +5160,7 @@ create_properties_window (StartupData *startup_data)
 			attributes |= NAUTILUS_FILE_ATTRIBUTE_DEEP_COUNTS;
 		}
 		
-		attributes |= NAUTILUS_FILE_ATTRIBUTE_METADATA;
+		attributes |= NAUTILUS_FILE_ATTRIBUTE_INFO;
 		nautilus_file_monitor_add (file, &window->details->target_files, attributes);
 	}	
 		
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index a64fbf4..6bfb584 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -46,7 +46,6 @@
 #include <glib/gi18n.h>
 #include <gio/gdesktopappinfo.h>
 #include <libnautilus-private/nautilus-debug-log.h>
-#include <libnautilus-private/nautilus-directory-metafile.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-lib-self-check-functions.h>
 #include <libnautilus-private/nautilus-icon-names.h>
diff --git a/src/nautilus-notes-viewer.c b/src/nautilus-notes-viewer.c
index 894dc2d..15717f7 100644
--- a/src/nautilus-notes-viewer.c
+++ b/src/nautilus-notes-viewer.c
@@ -264,7 +264,7 @@ notes_load_metainfo (NautilusNotesViewer *notes)
 		return;
         }
 
-        attributes = NAUTILUS_FILE_ATTRIBUTE_METADATA;
+        attributes = NAUTILUS_FILE_ATTRIBUTE_INFO;
         nautilus_file_monitor_add (notes->details->file, notes, attributes);
 
 	if (nautilus_file_check_if_ready (notes->details->file, attributes)) {
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index 2c9b081..57476e6 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -562,7 +562,7 @@ monitor_add (NautilusSidebarTitle *sidebar_title)
 
 	sidebar_title->details->monitoring_count = item_count_ready (sidebar_title);
 
-	attributes = NAUTILUS_FILE_ATTRIBUTES_FOR_ICON | NAUTILUS_FILE_ATTRIBUTE_METADATA;
+	attributes = NAUTILUS_FILE_ATTRIBUTES_FOR_ICON | NAUTILUS_FILE_ATTRIBUTE_INFO;
 	if (sidebar_title->details->monitoring_count) {
 		attributes |= NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT;
 	}
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 98a95ee..b84bb15 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -870,8 +870,7 @@ begin_location_change (NautilusWindowSlot *slot,
 
 	nautilus_file_call_when_ready (slot->determine_view_file,
 				       NAUTILUS_FILE_ATTRIBUTE_INFO |
-				       NAUTILUS_FILE_ATTRIBUTE_MOUNT |
-				       NAUTILUS_FILE_ATTRIBUTE_METADATA,
+				       NAUTILUS_FILE_ATTRIBUTE_MOUNT,
                                        got_file_info_for_view_selection_callback,
 				       slot);
 
@@ -1001,8 +1000,7 @@ mount_not_mounted_callback (GObject *source_object,
 	} else {
 		nautilus_file_invalidate_all_attributes (slot->determine_view_file);
 		nautilus_file_call_when_ready (slot->determine_view_file,
-					       NAUTILUS_FILE_ATTRIBUTE_INFO |
-					       NAUTILUS_FILE_ATTRIBUTE_METADATA,
+					       NAUTILUS_FILE_ATTRIBUTE_INFO,
 					       got_file_info_for_view_selection_callback,
 					       slot);
 	}
diff --git a/test/test-nautilus-directory-async.c b/test/test-nautilus-directory-async.c
index 6fb749b..3dabca4 100644
--- a/test/test-nautilus-directory-async.c
+++ b/test/test-nautilus-directory-async.c
@@ -95,7 +95,7 @@ main (int argc, char **argv)
 	g_signal_connect (directory, "files-changed", G_CALLBACK (files_changed), NULL);
 	g_signal_connect (directory, "done-loading", G_CALLBACK (done_loading), NULL);
 	nautilus_directory_file_monitor_add (directory, client1, TRUE, TRUE,
-					     NAUTILUS_FILE_ATTRIBUTE_METADATA, 
+					     NAUTILUS_FILE_ATTRIBUTE_INFO, 
 					     NULL, NULL);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]