Fixed bug 2210 (GNOME is referred to as Gnome in the about dialog). It was

	* src/nautilus-window-menus.c: (help_menu_about_nautilus_callback):
	* libnautilus-extensions/nautilus-program-chooser.c:
	(nautilus_program_chooser_new),
	(nautilus_program_chooser_show_no_choices_message):
	Fixed bug 2210 (GNOME is referred to as Gnome in the about
	dialog).  It was in one other place too.

	* libnautilus/nautilus-view-component.idl:
	Fixed some comments.

	* libnautilus-extensions/nautilus-directory-private.h:
	* libnautilus-extensions/nautilus-directory-async.c:
	(dequeue_pending_idle_callback):
	* libnautilus-extensions/nautilus-directory.c:
	(nautilus_directory_emit_files_changed),
	(nautilus_directory_emit_change_signals_deep),
	(nautilus_directory_emit_metadata_changed),
	(call_files_changed_free_list),
	(call_files_changed_unref_free_list):
	* libnautilus-extensions/nautilus-file.c: (nautilus_file_changed):
	Separated out the call so you can emit a files_changed without
	also emitting a changed signal on each file.


	* libnautilus-extensions/nautilus-trash-directory.h:
	* libnautilus-extensions/nautilus-trash-directory.c:
	(trash_callback_remove_directory), (directory_ready_callback),
	(forward_files_added_cover), (forward_files_changed_cover),
	(nautilus_trash_directory_add_real_directory),
	(trash_callback_remove_directory_cover),
	(nautilus_trash_directory_remove_real_directory),
	(remove_all_real_directories),
	(fm_desktop_icon_view_discover_trash_callback),
	(add_one_writable_device), (get_trashable_volume_uris),
	(nautilus_trash_monitor_async_get_trash_directories):
	More trash work. A bunch is commented out. I'm doing this *so*
	slowly, but I need to check in at this point for Gene's sake.

	* libnautilus-extensions/nautilus-volume-monitor.h:
	* libnautilus-extensions/nautilus-volume-monitor.c:
	(nautilus_volume_monitor_initialize_class),
	(mount_device_activate), (mount_device_deactivate):
	Changed the signals to be both more useful and easier to use.

	* src/file-manager/fm-desktop-icon-view.c:
	(fm_desktop_icon_view_initialize):
	* src/file-manager/nautilus-trash-monitor.c:
	Moved 1/2-written trash code out of here.

	* HACKING: Spell checking.

1 files changed, 9 insertions, 5 deletions

diff --git a/libnautilus-private/nautilus-trash-directory.h b/libnautilus-private/nautilus-trash-directory.h
index 7947aec43..9dec9f8a0 100644
--- a/libnautilus-private/nautilus-trash-directory.h
+++ b/libnautilus-private/nautilus-trash-directory.h
@@ -28,6 +28,10 @@
 
 #include "nautilus-directory.h"
 
+/* Very little of this is trash-specific, so we could give it a new
+ * name some day.
+ */
+
 #define NAUTILUS_TYPE_TRASH_DIRECTORY \
 	(nautilus_trash_directory_get_type ())
 #define NAUTILUS_TRASH_DIRECTORY(obj) \
@@ -50,10 +54,10 @@ typedef struct {
 	NautilusDirectoryClass parent_slot;
 } NautilusTrashDirectoryClass;
 
-GtkType nautilus_trash_directory_get_type                    (void);
-void    nautilus_trash_directory_add_real_trash_directory    (NautilusTrashDirectory *trash,
-							      NautilusDirectory      *real_directory);
-void    nautilus_trash_directory_remove_real_trash_directory (NautilusTrashDirectory *trash,
-							      NautilusDirectory      *real_directory);
+GtkType nautilus_trash_directory_get_type              (void);
+void    nautilus_trash_directory_add_real_directory    (NautilusTrashDirectory *trash,
+							NautilusDirectory      *real_directory);
+void    nautilus_trash_directory_remove_real_directory (NautilusTrashDirectory *trash,
+							NautilusDirectory      *real_directory);
 
 #endif /* NAUTILUS_TRASH_DIRECTORY_H */