Made this function public because it's needed to get the assert right.

	* libnautilus-extensions/nautilus-directory-private.h:
	* libnautilus-extensions/nautilus-directory-async.c:
	(nautilus_directory_is_anyone_monitoring_file_list):
	Made this function public because it's needed to get the
	assert right.
	(start_or_stop_io): Use it by the new public name.
	* libnautilus-extensions/nautilus-vfs-directory.c:
	(vfs_is_not_empty): Use the new function to get the assert
	right, which fixes bug 2706 (crash at startup with
	bookmark for nonexistent trash file).

	* libnautilus-extensions/nautilus-trash-directory.c:
	(remove_trash_volume): Fix a NautilusDirectory leak.

	* libnautilus-extensions/nautilus-glib-extensions.c:
	(print_key_string), (free_hash_tables_at_exit):
	Print keys before complaining about hash table so you
	see them first if you have things set to drop into
	the debugger on warnings.

1 files changed, 53 insertions, 52 deletions

diff --git a/libnautilus-private/nautilus-directory-private.h b/libnautilus-private/nautilus-directory-private.h
index 008ee21f3..bbf177e10 100644
--- a/libnautilus-private/nautilus-directory-private.h
+++ b/libnautilus-private/nautilus-directory-private.h
@@ -96,61 +96,62 @@ struct NautilusDirectoryDetails
 };
 
 /* 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);
-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);
+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);
+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_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_change_signals_deep  (NautilusDirectory         *directory,
-								 GList                     *changed_files);
-void               nautilus_directory_emit_done_loading         (NautilusDirectory         *directory);
-NautilusDirectory *nautilus_directory_get_internal              (const char                *uri,
-								 gboolean                   create);
+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_change_signals_deep       (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);