reviewed by: Darin Adler <darin@eazel.com>

	reviewed by: Darin Adler  <darin@eazel.com>

	* libnautilus-extensions/nautilus-directory-async.c:
	(is_anyone_waiting_for_metafile), (call_ready_callbacks),
	(start_or_stop_io), (nautilus_directory_cancel):
	* libnautilus-extensions/nautilus-directory-metafile-monitor.c:
	(corba_metafile_ready):
	* libnautilus-extensions/nautilus-directory-metafile.c:
	(get_metafile), (nautilus_directory_rename_file_metadata),
	(nautilus_directory_rename_directory_metadata):
	* libnautilus-extensions/nautilus-directory-metafile.h:
	* libnautilus-extensions/nautilus-directory-private.h:
	* libnautilus-extensions/nautilus-directory.c:
	(nautilus_directory_initialize), (nautilus_directory_destroy),
	(set_directory_uri), (change_directory_uri),
	(nautilus_self_check_directory):
	* libnautilus-extensions/nautilus-directory.h:
	* libnautilus-extensions/nautilus-file-utilities.c:
	(nautilus_file_name_matches_backup_pattern),
	(nautilus_file_name_matches_metafile_pattern):
	* libnautilus-extensions/nautilus-file-utilities.h:
	* libnautilus-extensions/nautilus-file.c:
	(nautilus_file_is_metafile):
	* libnautilus-extensions/nautilus-file.h:
	* libnautilus-extensions/nautilus-metafile-factory.c: (corba_open):
	* libnautilus-extensions/nautilus-metafile-server.idl:
	* libnautilus-extensions/nautilus-metafile.c:
	(nautilus_metafile_class_init), (nautilus_metafile_init),
	(destroy), (construct_private_metafile_vfs_uri),
	(nautilus_metafile_set_directory_uri), (nautilus_metafile_new),
	(nautilus_metafile_get), (schedule_next_read), (async_read_start),
	(async_read_done), (async_read_cancel), (corba_is_read),
	(corba_get), (corba_get_list), (corba_set), (corba_set_list),
	(corba_copy), (corba_remove), (corba_rename),
	(corba_rename_directory), (corba_register_monitor),
	(corba_unregister_monitor),
	(nautilus_metafile_notify_metafile_ready), (call_metafile_changed),
	(call_metafile_changed_for_all_files_mentioned_in_metafile),
	(call_metafile_changed_for_one_file), (create_metafile_root),
	(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), (set_metadata_eat_value),
	(metafile_free_metadata), (get_file_metadata),
	(get_file_metadata_list), (set_file_metadata),
	(set_file_metadata_list), (metafile_get_file_uri),
	(rename_file_metadata), (apply_one_change), (apply_file_changes),
	(nautilus_metafile_apply_pending_changes), (copy_file_metadata),
	(remove_file_metadata), (nautilus_metafile_set_metafile_contents),
	(metafile_read_cancel), (can_use_public_metafile),
	(metafile_read_mark_done), (metafile_read_done),
	(metafile_read_try_public_metafile),
	(metafile_read_check_for_directory_callback),
	(metafile_read_check_for_directory), (metafile_read_failed),
	(metafile_read_done_callback), (metafile_read_restart),
	(allow_metafile), (metafile_read_start), (metafile_write_done),
	(metafile_write_failed), (metafile_write_failure_close_callback),
	(metafile_write_success_close_callback), (metafile_write_callback),
	(metafile_write_create_callback), (metafile_write_start),
	(metafile_write), (metafile_write_idle_callback),
	(directory_request_write_metafile):
	* libnautilus-extensions/nautilus-metafile.h:
	* libnautilus-extensions/nautilus-vfs-directory.c:
	(vfs_is_not_empty):
	Factored the metadata reading/writing code out of nautilus-directory
	- bug 6661.

1 files changed, 2 insertions, 18 deletions

diff --git a/libnautilus-extensions/nautilus-directory-private.h b/libnautilus-extensions/nautilus-directory-private.h
index 46a56bf57..36a8750d4 100644
--- a/libnautilus-extensions/nautilus-directory-private.h
+++ b/libnautilus-extensions/nautilus-directory-private.h
@@ -34,10 +34,9 @@
 #include "nautilus-file-utilities.h"
 #include "nautilus-directory-metafile-monitor.h"
 #include "nautilus-metafile-server.h"
+#include "nautilus-idle-queue.h"
 
 typedef struct ActivationURIReadState ActivationURIReadState;
-typedef struct MetafileReadState MetafileReadState;
-typedef struct MetafileWriteState MetafileWriteState;
 typedef struct TopLeftTextReadState TopLeftTextReadState;
 
 struct NautilusDirectoryDetails
@@ -45,33 +44,20 @@ struct NautilusDirectoryDetails
 	/* The location. */
 	char *uri;
 	GnomeVFSURI *vfs_uri;
-	GnomeVFSURI *private_metafile_vfs_uri;
-	GnomeVFSURI *public_metafile_vfs_uri;
 
 	/* The file objects. */
 	NautilusFile *as_file;
 	GList *file_list;
 	GHashTable *file_hash;
 
-	/* The metadata. */
-	gboolean metafile_read;
-	xmlDoc *metafile;
-	GHashTable *metafile_node_hash;
-	GHashTable *metadata_changes;
-
-	/* State for reading and writing metadata. */
-	MetafileReadState *metafile_read_state;
-	guint write_metafile_idle_id;
-	MetafileWriteState *metafile_write_state;
-
 	/* These lists are going to be pretty short.  If we think they
 	 * are going to get big, we can use hash tables instead.
 	 */
 	GList *call_when_ready_list;
 	GList *monitor_list;
 
+	NautilusIdleQueue *idle_queue;
 	NautilusMetafileMonitor *metafile_monitor;
-	gboolean load_metafile_for_server;
 	Nautilus_Metafile metafile_corba_object;
 
 	gboolean in_async_service_loop;
@@ -161,11 +147,9 @@ gboolean           nautilus_directory_is_file_list_monitored          (NautilusD
 gboolean           nautilus_directory_is_anyone_monitoring_file_list  (NautilusDirectory         *directory);
 void               nautilus_directory_remove_file_monitor_link        (NautilusDirectory         *directory,
 								       GList                     *link);
-void               nautilus_directory_request_write_metafile          (NautilusDirectory         *directory);
 void               nautilus_directory_schedule_dequeue_pending        (NautilusDirectory         *directory);
 void               nautilus_directory_stop_monitoring_file_list       (NautilusDirectory         *directory);
 void               nautilus_directory_cancel                          (NautilusDirectory         *directory);
-void               nautilus_metafile_write_start                      (NautilusDirectory         *directory);
 void               nautilus_async_destroying_file                     (NautilusFile              *file);
 void               nautilus_directory_force_reload_internal           (NautilusDirectory         *directory,
 								       GList                     *file_attributes);