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

	Fixed bug 5569 (Desktop should not show up in history list)

	I also prevented Control-B on the desktop from adding the
	desktop to the Bookmarks list.

	* src/file-manager/nautilus-desktop-icon-view-ui.xml:
	overrode command "Add Bookmark" to be insensitive.

	* src/nautilus-window.h: Declare function pointer for
	add_current_location_to_history_list.

	* src/nautilus-window-private.h: Declare private function
	nautilus_window_add_current_location_to_history_list.

	* src/nautilus-window.c:
	(nautilus_window_initialize_class),
	(real_add_current_location_to_history_list): Fill in
	add_current_location_to_history_list function pointer
	with simple function.
	(nautilus_window_add_current_location_to_history_list):
	wrapper for calling the new virtual function.
	(nautilus_forget_history):
	Call nautilus_window_add_current_location_to_history_list
	where it was doing the work directly, to get the indirection.

	* src/nautilus-window-manage-views.c: (update_for_new_location):
	Call nautilus_window_add_current_location_to_history_list
	where it was doing the work directly, to get the indirection.

	* src/nautilus-desktop-window.c:
	(nautilus_desktop_window_initialize_class),
	(real_add_current_location_to_history_list): Override
	add_current_location_to_history_list to do nothing.

1 files changed, 10 insertions, 0 deletions

diff --git a/src/nautilus-spatial-window.h b/src/nautilus-spatial-window.h
index ed9b189b2..64cd4fd34 100644
--- a/src/nautilus-spatial-window.h
+++ b/src/nautilus-spatial-window.h
@@ -50,6 +50,16 @@ typedef struct NautilusWindow NautilusWindow;
 
 typedef struct {
         BonoboWindowClass parent_spot;
+
+	/* Function pointers for overriding, without corresponding signals */
+
+	/* add_current_location_to_history_list is a function pointer that
+	 * subclasses may override if they wish to add something other than
+	 * NautilusWindow's idea of the "current location" to the history
+	 * list, or nothing at all.
+	 */
+        void (* add_current_location_to_history_list)	(NautilusWindow *window);
+        
 } NautilusWindowClass;
 
 typedef struct NautilusWindowStateInfo NautilusWindowStateInfo;