Moved the notify calls to a separate header, since people were using them

	* libnautilus-extensions/Makefile.am:
	* libnautilus-extensions/nautilus-directory-notify.h:
	* libnautilus-extensions/nautilus-directory-private.h:
	* libnautilus-extensions/nautilus-file-changes-queue.c:
	* libnautilus-extensions/nautilus-link.c:
	* libnautilus-extensions/nautilus-volume-monitor.c:
	Moved the notify calls to a separate header, since people were
	using them as an excuse to peek at NautilusDirectory's privates.

	* libnautilus-extensions/nautilus-directory.c:
	(nautilus_directory_get_internal), (nautilus_directory_get),
	(nautilus_directory_get_existing): Cleaned up API so that
	internal code can get a directory without creating one.
	(get_parent_directory_if_exists): Used new API to cut down
	code a bit.
	(nautilus_directory_notify_files_removed),
	(nautilus_directory_notify_files_moved): Always create a
	NautilusFile object. This results in a bit more work, but is
	more compatible with the 1/2 done symbolic link change notify
	work.

	* libnautilus-extensions/nautilus-file.c:
	(nautilus_file_get_internal): Don't create a new directory if
	being called in the mode where we don't create a new file.
	(update_link), (get_link_files),
	(update_links_if_target), (nautilus_file_update_info),
	(nautilus_file_mark_gone), (nautilus_file_emit_changed):
	More work on notifying links about changes to the target file.
	This isn't quite working and isn't required so I'll get back to it
	later. At the moment it is not doing any harm.

1 files changed, 52 insertions, 61 deletions

diff --git a/libnautilus-extensions/nautilus-directory-private.h b/libnautilus-extensions/nautilus-directory-private.h
index b4fd888e1..8f1f5d679 100644
--- a/libnautilus-extensions/nautilus-directory-private.h
+++ b/libnautilus-extensions/nautilus-directory-private.h
@@ -95,71 +95,62 @@ struct NautilusDirectoryDetails
 	GList *file_operations_in_progress; /* list of FileOperation * */
 };
 
-typedef struct {
-	char *from_uri;
-	char *to_uri;
-} URIPair;
-
-/* Almost-public change notification calls */
-void          nautilus_directory_notify_files_added        (GList                     *uris);
-void          nautilus_directory_notify_files_moved        (GList                     *uri_pairs);
-void          nautilus_directory_notify_files_removed      (GList                     *uris);
-
 /* async. interface */
-void          nautilus_directory_async_state_changed       (NautilusDirectory         *directory);
-void          nautilus_directory_call_when_ready_internal  (NautilusDirectory         *directory,
-							    NautilusFile              *file,
-							    GList                     *file_attributes,
-							    gboolean                   monitor_metadata,
-							    NautilusDirectoryCallback  directory_callback,
-							    NautilusFileCallback       file_callback,
-							    gpointer                   callback_data);
-gboolean      nautilus_directory_check_if_ready_internal   (NautilusDirectory         *directory,
-							    NautilusFile              *file,
-							    GList                     *file_attributes);
-void          nautilus_directory_cancel_callback_internal  (NautilusDirectory         *directory,
-							    NautilusFile              *file,
-							    NautilusDirectoryCallback  directory_callback,
-							    NautilusFileCallback       file_callback,
-							    gpointer                   callback_data);
-void          nautilus_directory_monitor_add_internal      (NautilusDirectory         *directory,
-							    NautilusFile              *file,
-							    gconstpointer              client,
-							    GList                     *attributes,
-							    gboolean                   monitor_metadata,
-							    NautilusDirectoryCallback  callback,
-							    gpointer                   callback_data);
-void          nautilus_directory_monitor_remove_internal   (NautilusDirectory         *directory,
-							    NautilusFile              *file,
-							    gconstpointer              client);
-void          nautilus_directory_get_info_for_new_files    (NautilusDirectory         *directory,
-							    GList                     *vfs_uris);
-gboolean      nautilus_directory_is_file_list_monitored    (NautilusDirectory         *directory);
-void          nautilus_directory_remove_file_monitor_link  (NautilusDirectory         *directory,
-							    GList                     *link);
-void          nautilus_directory_request_read_metafile     (NautilusDirectory         *directory);
-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              (NautilusDirectory         *directory);
+void               nautilus_directory_async_state_changed       (NautilusDirectory         *directory);
+void               nautilus_directory_call_when_ready_internal  (NautilusDirectory         *directory,
+								 NautilusFile              *file,
+								 GList                     *file_attributes,
+								 gboolean                   monitor_metadata,
+								 NautilusDirectoryCallback  directory_callback,
+								 NautilusFileCallback       file_callback,
+								 gpointer                   callback_data);
+gboolean           nautilus_directory_check_if_ready_internal   (NautilusDirectory         *directory,
+								 NautilusFile              *file,
+								 GList                     *file_attributes);
+void               nautilus_directory_cancel_callback_internal  (NautilusDirectory         *directory,
+								 NautilusFile              *file,
+								 NautilusDirectoryCallback  directory_callback,
+								 NautilusFileCallback       file_callback,
+								 gpointer                   callback_data);
+void               nautilus_directory_monitor_add_internal      (NautilusDirectory         *directory,
+								 NautilusFile              *file,
+								 gconstpointer              client,
+								 GList                     *attributes,
+								 gboolean                   monitor_metadata,
+								 NautilusDirectoryCallback  callback,
+								 gpointer                   callback_data);
+void               nautilus_directory_monitor_remove_internal   (NautilusDirectory         *directory,
+								 NautilusFile              *file,
+								 gconstpointer              client);
+void               nautilus_directory_get_info_for_new_files    (NautilusDirectory         *directory,
+								 GList                     *vfs_uris);
+gboolean           nautilus_directory_is_file_list_monitored    (NautilusDirectory         *directory);
+void               nautilus_directory_remove_file_monitor_link  (NautilusDirectory         *directory,
+								 GList                     *link);
+void               nautilus_directory_request_read_metafile     (NautilusDirectory         *directory);
+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              (NautilusDirectory         *directory);
 
 /* Calls shared between directory, file, and async. code. */
-NautilusFile *nautilus_directory_find_file                 (NautilusDirectory         *directory,
-							    const char                *file_name);
-void          nautilus_directory_emit_metadata_changed     (NautilusDirectory         *directory);
-void          nautilus_directory_emit_files_added          (NautilusDirectory         *directory,
-							    GList                     *added_files);
-void          nautilus_directory_emit_files_changed        (NautilusDirectory         *directory,
-							    GList                     *changed_files);
-void          nautilus_directory_emit_done_loading         (NautilusDirectory         *directory);
-
+NautilusFile *     nautilus_directory_find_file                 (NautilusDirectory         *directory,
+								 const char                *file_name);
+void               nautilus_directory_emit_metadata_changed     (NautilusDirectory         *directory);
+void               nautilus_directory_emit_files_added          (NautilusDirectory         *directory,
+								 GList                     *added_files);
+void               nautilus_directory_emit_files_changed        (NautilusDirectory         *directory,
+								 GList                     *changed_files);
+void               nautilus_directory_emit_done_loading         (NautilusDirectory         *directory);
+NautilusDirectory *nautilus_directory_get_internal              (const char                *uri,
+								 gboolean                   create);
 
 /* debugging functions */
-int           nautilus_directory_number_outstanding        (void);
+int                nautilus_directory_number_outstanding        (void);
 
 /* Shared functions not directly related to NautilusDirectory/File. */
-int           nautilus_compare_file_with_name              (gconstpointer              a,
-							    gconstpointer              b);
+int                nautilus_compare_file_with_name              (gconstpointer              a,
+								 gconstpointer              b);