Factored out code that's common to failure and success and made it call

	* libnautilus-extensions/nautilus-directory-async.c:
	(metafile_read_done), (metafile_read_failed),
	(metafile_read_complete): Factored out code that's common to failure
	and success and made it call the new
	nautilus_directory_metafile_apply_pending_changes function to take
	care of changes made while reading the metafile.

	* libnautilus-extensions/nautilus-directory-metafile.h:
	* libnautilus-extensions/nautilus-directory-metafile.c:
	(get_metadata_list_from_node), (get_file_node),
	(get_metadata_string_from_metafile),
	(get_metadata_list_from_metafile),
	(set_metadata_string_in_metafile), (set_metadata_list_in_metafile),
	(set_metadata_in_metafile), (get_metadata_string_from_table),
	(get_metadata_list_from_table), (str_or_null_hash),
	(str_or_null_equal), (set_metadata_eat_value),
	(free_file_table_entry), (free_directory_table_entry),
	(destroy_metadata_changes_hash_table),
	(nautilus_directory_get_metadata),
	(nautilus_directory_get_file_metadata),
	(nautilus_directory_get_metadata_list),
	(nautilus_directory_get_file_metadata_list),
	(nautilus_directory_set_metadata),
	(nautilus_directory_set_file_metadata),
	(nautilus_directory_set_file_metadata_list),
	(nautilus_directory_update_file_metadata), (apply_one_change),
	(apply_file_changes),
	(nautilus_directory_metafile_apply_pending_changes),
	(nautilus_directory_get_boolean_metadata),
	(nautilus_directory_set_boolean_metadata),
	(nautilus_directory_get_integer_metadata),
	(nautilus_directory_set_integer_metadata):
	Redid everything to use two hash tables to hold metadata before the
	metafile is read in.

	* libnautilus-extensions/nautilus-directory-private.h:
	Made the "NAME" XML tag be private again. It's now only used inside
	the nautilus-directory-metafile.c code.

	* libnautilus-extensions/nautilus-file.c:
	(rename_update_info_and_metafile): Moved the code for this inside the
	nautilus-directory-metafile.c code.

	* libnautilus-extensions/nautilus-glib-extensions.c:
	(nautilus_g_ptr_array_sort): Took out a FIXME comment now that my
	question about the code is answered. We can't use qsort because it
	does not take a context pointer.

	* libnautilus-extensions/nautilus-string.h: Formatting.

1 files changed, 26 insertions, 22 deletions

diff --git a/libnautilus-private/nautilus-directory-metafile.h b/libnautilus-private/nautilus-directory-metafile.h
index 4ee98f14e..cbd37fe99 100644
--- a/libnautilus-private/nautilus-directory-metafile.h
+++ b/libnautilus-private/nautilus-directory-metafile.h
@@ -25,25 +25,29 @@
 #include "nautilus-directory.h"
 #include <tree.h>
 
-char *   nautilus_directory_get_file_metadata      (NautilusDirectory *directory,
-						    const char        *file_name,
-						    const char        *key,
-						    const char        *default_metadata);
-GList *  nautilus_directory_get_file_metadata_list (NautilusDirectory *directory,
-						    const char        *file_name,
-						    const char        *list_key,
-						    const char        *list_subkey);
-gboolean nautilus_directory_set_file_metadata      (NautilusDirectory *directory,
-						    const char        *file_name,
-						    const char        *key,
-						    const char        *default_metadata,
-						    const char        *metadata);
-gboolean nautilus_directory_set_file_metadata_list (NautilusDirectory *directory,
-						    const char        *file_name,
-						    const char        *list_key,
-						    const char        *list_subkey,
-						    GList             *list);
-xmlNode *nautilus_directory_get_file_metadata_node (NautilusDirectory *directory,
-						    const char        *file_name,
-						    gboolean           create);
-void     nautilus_directory_metafile_destroy       (NautilusDirectory *directory);
+/* Interface for file metadata. */
+char *   nautilus_directory_get_file_metadata              (NautilusDirectory *directory,
+							    const char        *file_name,
+							    const char        *key,
+							    const char        *default_metadata);
+GList *  nautilus_directory_get_file_metadata_list         (NautilusDirectory *directory,
+							    const char        *file_name,
+							    const char        *list_key,
+							    const char        *list_subkey);
+gboolean nautilus_directory_set_file_metadata              (NautilusDirectory *directory,
+							    const char        *file_name,
+							    const char        *key,
+							    const char        *default_metadata,
+							    const char        *metadata);
+gboolean nautilus_directory_set_file_metadata_list         (NautilusDirectory *directory,
+							    const char        *file_name,
+							    const char        *list_key,
+							    const char        *list_subkey,
+							    GList             *list);
+void     nautilus_directory_update_file_metadata           (NautilusDirectory *directory,
+							    const char        *old_file_name,
+							    const char        *new_file_name);
+
+/* Interface for housekeeping. */
+void     nautilus_directory_metafile_apply_pending_changes (NautilusDirectory *directory);
+void     nautilus_directory_metafile_destroy               (NautilusDirectory *directory);