Removed unused "self_owned" field.

	* libnautilus-extensions/nautilus-file-private.h:
	Removed unused "self_owned" field.

	* libnautilus/nautilus-view-component.idl:
	* libnautilus/nautilus-view.h:
	* libnautilus/nautilus-view.c:
	(nautilus_view_open_location_in_new_window):
	* src/file-manager/fm-directory-view.c:
	(fm_directory_view_switch_location):
	* src/file-manager/fm-search-list-view.c:
	(reveal_selected_items_callback):
	* src/nautilus-view-frame-corba.c:
	(impl_Nautilus_ViewFrame_open_location),
	(impl_Nautilus_ViewFrame_open_location_in_new_window),
	(impl_Nautilus_ViewFrame_report_selection_change):
	* src/nautilus-view-frame-private.h:
	* src/nautilus-view-frame.h:
	* src/nautilus-view-frame.c:
	(nautilus_view_frame_initialize_class),
	(nautilus_view_frame_open_location_in_new_window):
	Removed report_location_change and
	open_in_new_window_and_select. The open_location_in_new_window
	call now always does a selection operation.

	* src/nautilus-window-manage-views.h:
	* src/nautilus-window-manage-views.c: (update_view),
	(nautilus_window_load_sidebar_panel), (open_location),
	(nautilus_window_open_location),
	(nautilus_window_open_location_in_new_window),
	(nautilus_window_load_content_view),
	(nautilus_window_update_state),
	(nautilus_window_begin_location_change):
	* src/nautilus-window-private.h:
	* src/nautilus-window.h:
	* src/nautilus-window.c: (nautilus_window_switch_views),
	(nautilus_window_back_or_forward),
	(nautilus_window_open_location_in_new_window_callback),
	(nautilus_window_connect_view), (nautilus_window_reload):
	Made some simplifications that are possible because we don't
	have the old report_location_change to support.

23 files changed, 126 insertions, 333 deletions

diff --git a/ChangeLog b/ChangeLog
index f6856b0b4..bf7166192 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2000-09-29  Darin Adler  <darin@eazel.com>
+
+	* libnautilus-extensions/nautilus-file-private.h:
+	Removed unused "self_owned" field.
+	
+	* libnautilus/nautilus-view-component.idl:
+	* libnautilus/nautilus-view.h:
+	* libnautilus/nautilus-view.c:
+	(nautilus_view_open_location_in_new_window):
+	* src/file-manager/fm-directory-view.c:
+	(fm_directory_view_switch_location):
+	* src/file-manager/fm-search-list-view.c:
+	(reveal_selected_items_callback):
+	* src/nautilus-view-frame-corba.c:
+	(impl_Nautilus_ViewFrame_open_location),
+	(impl_Nautilus_ViewFrame_open_location_in_new_window),
+	(impl_Nautilus_ViewFrame_report_selection_change):
+	* src/nautilus-view-frame-private.h:
+	* src/nautilus-view-frame.h:
+	* src/nautilus-view-frame.c:
+	(nautilus_view_frame_initialize_class),
+	(nautilus_view_frame_open_location_in_new_window):
+	Removed report_location_change and
+	open_in_new_window_and_select. The open_location_in_new_window
+	call now always does a selection operation.
+	
+	* src/nautilus-window-manage-views.h:
+	* src/nautilus-window-manage-views.c: (update_view),
+	(nautilus_window_load_sidebar_panel), (open_location),
+	(nautilus_window_open_location),
+	(nautilus_window_open_location_in_new_window),
+	(nautilus_window_load_content_view),
+	(nautilus_window_update_state),
+	(nautilus_window_begin_location_change):
+	* src/nautilus-window-private.h:
+	* src/nautilus-window.h:
+	* src/nautilus-window.c: (nautilus_window_switch_views),
+	(nautilus_window_back_or_forward),
+	(nautilus_window_open_location_in_new_window_callback),
+	(nautilus_window_connect_view), (nautilus_window_reload):
+	Made some simplifications that are possible because we don't
+	have the old report_location_change to support.
+
 2000-09-29  Andy Hertzfeld  <andy@eazel.com>
 
 	* libnautilus-extensions/nautilus-thumbnails.c:
diff --git a/libnautilus-extensions/nautilus-file-private.h b/libnautilus-extensions/nautilus-file-private.h
index f3ee31a80..34b6f2fcb 100644
--- a/libnautilus-extensions/nautilus-file-private.h
+++ b/libnautilus-extensions/nautilus-file-private.h
@@ -28,7 +28,6 @@
 struct NautilusFileDetails
 {
 	NautilusDirectory *directory;
-	gboolean self_owned;
 	gboolean unconfirmed;
 
 	gboolean is_gone;
diff --git a/libnautilus-private/nautilus-file-private.h b/libnautilus-private/nautilus-file-private.h
index f3ee31a80..34b6f2fcb 100644
--- a/libnautilus-private/nautilus-file-private.h
+++ b/libnautilus-private/nautilus-file-private.h
@@ -28,7 +28,6 @@
 struct NautilusFileDetails
 {
 	NautilusDirectory *directory;
-	gboolean self_owned;
 	gboolean unconfirmed;
 
 	gboolean is_gone;
diff --git a/libnautilus/nautilus-view-component.idl b/libnautilus/nautilus-view-component.idl
index f68e17639..5a004a634 100644
--- a/libnautilus/nautilus-view-component.idl
+++ b/libnautilus/nautilus-view-component.idl
@@ -13,6 +13,11 @@
 
 #include <Bonobo.idl>
 
+/* FIXME bugzilla.eazel.com 2974: Use of doubles causes alignment
+ * problems in Solaris due to an ORBit bug; we use floats throughout
+ * this file as a workaround.
+ */
+
 module Nautilus {
 
 	/* URIs are just plain strings, but we use a typedef to make
@@ -53,18 +58,13 @@ module Nautilus {
 	 */
 	interface ViewFrame : ::Bonobo::Unknown {
 		/* Called by the view component to change the location
-		 * shown in the window or to open a new window. The
-		 * "report" version is used when the view has already
-		 * changed its location and would confused by an
-		 * additional load call, but it's deprecated and may
-		 * be removed from a future version of this interface.
-		 * The "and_select" version is used to specify the
-		 * initial selection in the new location.
+		 * shown in the window or to open a new window. In the
+		 * case of a new window, you can specify the initial
+		 * selection in the new location.
 		 */
 		oneway void open_location (in URI location);
-		oneway void open_location_in_new_window (in URI location);
-		oneway void open_in_new_window_and_select (in URI location, in URIList selection);
-		oneway void report_location_change (in URI location);
+		oneway void open_location_in_new_window (in URI location,
+							 in URIList selection);
 
 		/* Called by a view component to announce a change in the
 		 * selection. This selection change will be reported back
@@ -91,7 +91,6 @@ module Nautilus {
 		 */
 		oneway void report_load_underway ();
 
-		/* FIXME bugzilla.eazel.com 2974: use of doubles causes alignment problems in Solaris; using floats is a workaround */
 		oneway void report_load_progress (in float fraction_done);
 		oneway void report_load_complete ();
 		oneway void report_load_failed ();
@@ -100,7 +99,6 @@ module Nautilus {
 		oneway void set_title (in string new_title);
 	};		
 
-	/* FIXME bugzilla.eazel.com 2974: use of doubles causes alignment problems in Solaris; using floats is a workaround */
 	typedef float ZoomLevel;
 	typedef sequence<ZoomLevel> ZoomLevelList;
 	
@@ -112,11 +110,9 @@ module Nautilus {
 	 */
 	interface Zoomable : ::Bonobo::Unknown {
 		/* Set this attribute to make the thing zoom. */
-		/* FIXME bugzilla.eazel.com 2974: use of doubles causes alignment problems in Solaris; using floats is a workaround */
 		attribute float zoom_level;
 
 		/* Information about the type of zooming that's supported. */
-		/* FIXME bugzilla.eazel.com 2974: use of doubles causes alignment problems in Solaris; using floats is a workaround */
 		readonly attribute float min_zoom_level;
 		readonly attribute float max_zoom_level;
 		readonly attribute boolean is_continuous;
@@ -138,7 +134,6 @@ module Nautilus {
 	 * its own or due to calls from the zoomable interface).
 	 */
 	interface ZoomableFrame : ::Bonobo::Unknown {
-		/* FIXME bugzilla.eazel.com 2974: use of doubles causes alignment problems in Solaris; using floats is a workaround */
 		oneway void report_zoom_level_changed (in float zoom_level);
 	};
 
diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c
index 0b7674fbe..d39daa8aa 100644
--- a/libnautilus/nautilus-view.c
+++ b/libnautilus/nautilus-view.c
@@ -345,22 +345,8 @@ nautilus_view_open_location (NautilusView *view,
 
 void
 nautilus_view_open_location_in_new_window (NautilusView *view,
-					   const char *location)
-{
-	CORBA_Environment ev;
-	Nautilus_ViewFrame view_frame;
-	
-	view_frame = view_frame_call_begin (view, &ev);
-	if (view_frame != CORBA_OBJECT_NIL) {
-		Nautilus_ViewFrame_open_location_in_new_window (view_frame, (CORBA_char *) location, &ev);
-	}
-	view_frame_call_end (view_frame, &ev);
-}
-
-void
-nautilus_view_open_in_new_window_and_select (NautilusView *view,
-					     const char *location,
-					     GList *selection)
+					   const char *location,
+					   GList *selection)
 {
 	CORBA_Environment ev;
 	Nautilus_ViewFrame view_frame;
@@ -369,27 +355,13 @@ nautilus_view_open_in_new_window_and_select (NautilusView *view,
 	view_frame = view_frame_call_begin (view, &ev);
 	if (view_frame != CORBA_OBJECT_NIL) {
 		uri_list = nautilus_uri_list_from_g_list (selection);
-		Nautilus_ViewFrame_open_in_new_window_and_select (view_frame, (CORBA_char *) location, uri_list, &ev);
+		Nautilus_ViewFrame_open_location_in_new_window (view_frame, (CORBA_char *) location, uri_list, &ev);
 		CORBA_free (uri_list);
 	}
 	view_frame_call_end (view_frame, &ev);
 }
 
 void
-nautilus_view_report_location_change (NautilusView *view,
-				      const char *location)
-{
-	CORBA_Environment ev;
-	Nautilus_ViewFrame view_frame;
-	
-	view_frame = view_frame_call_begin (view, &ev);
-	if (view_frame != CORBA_OBJECT_NIL) {
-		Nautilus_ViewFrame_report_location_change (view_frame, (CORBA_char *) location, &ev);
-	}
-	view_frame_call_end (view_frame, &ev);
-}
-
-void
 nautilus_view_report_selection_change (NautilusView *view,
 				       GList *selection)
 {
diff --git a/libnautilus/nautilus-view.h b/libnautilus/nautilus-view.h
index 68dc13d39..21776b1e0 100644
--- a/libnautilus/nautilus-view.h
+++ b/libnautilus/nautilus-view.h
@@ -53,12 +53,11 @@ typedef struct {
 	BonoboObjectClass parent_spot;
 	
 	void (*load_location)     (NautilusView *view,
-		                   const char   *location_uri,
-		                   const char   *referring_location_uri);
+		                   const char   *location_uri);
 	void (*stop_loading)      (NautilusView *view);
 	void (*selection_changed) (NautilusView *view,
 				   GList        *selection); /* list of URI char *s */
-	void (*title_changed) (NautilusView *view);
+	void (*title_changed)     (NautilusView *view);
 } NautilusViewClass;
 
 GtkType           nautilus_view_get_type                    (void);
@@ -67,26 +66,22 @@ NautilusView *    nautilus_view_new_from_bonobo_control     (BonoboControl
 BonoboControl *   nautilus_view_get_bonobo_control          (NautilusView           *view);
 
 /* Calls to the Nautilus shell via the view frame. See the IDL for detailed comments. */
-void              nautilus_view_report_location_change        (NautilusView           *view,
-							       const char             *location_uri);
-void              nautilus_view_open_location                 (NautilusView           *view,
-							       const char             *location_uri);
-void              nautilus_view_open_location_in_new_window   (NautilusView           *view,
-							       const char             *location_uri);
-void              nautilus_view_open_in_new_window_and_select (NautilusView           *view,
-							       const char             *location_uri,
-							       GList		      *selection);
-void              nautilus_view_report_selection_change       (NautilusView           *view,
-							       GList                  *selection); /* list of URI char *s */
-void              nautilus_view_report_status                 (NautilusView           *view,
-							       const char             *status);
-void              nautilus_view_report_load_underway          (NautilusView           *view);
-void              nautilus_view_report_load_progress          (NautilusView           *view,
-							       double                  fraction_done);
-void              nautilus_view_report_load_complete          (NautilusView           *view);
-void              nautilus_view_report_load_failed            (NautilusView           *view);
-void              nautilus_view_set_title                     (NautilusView           *view,
-							       const char             *title);
+void              nautilus_view_open_location               (NautilusView           *view,
+							     const char             *location_uri);
+void              nautilus_view_open_location_in_new_window (NautilusView           *view,
+							     const char             *location_uri,
+							     GList                  *selection); /* list of URI char *s */
+void              nautilus_view_report_selection_change     (NautilusView           *view,
+							     GList                  *selection); /* list of URI char *s */
+void              nautilus_view_report_status               (NautilusView           *view,
+							     const char             *status);
+void              nautilus_view_report_load_underway        (NautilusView           *view);
+void              nautilus_view_report_load_progress        (NautilusView           *view,
+							     double                  fraction_done);
+void              nautilus_view_report_load_complete        (NautilusView           *view);
+void              nautilus_view_report_load_failed          (NautilusView           *view);
+void              nautilus_view_set_title                   (NautilusView           *view,
+							     const char             *title);
 
 /* Some utility functions useful for doing the CORBA work directly.
  * Not needed by most components, but shared with the view frame code,
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 25213e3d3..4069d711a 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -541,7 +541,7 @@ fm_directory_view_switch_location (FMDirectoryView *directory_view,
 
 	if (use_new_window) {
 		nautilus_view_open_location_in_new_window
-			(directory_view->details->nautilus_view, new_uri);
+			(directory_view->details->nautilus_view, new_uri, NULL);
 	} else {
 		nautilus_view_open_location
 			(directory_view->details->nautilus_view, new_uri);
diff --git a/src/file-manager/fm-search-list-view.c b/src/file-manager/fm-search-list-view.c
index 009e7d716..0a53312a1 100644
--- a/src/file-manager/fm-search-list-view.c
+++ b/src/file-manager/fm-search-list-view.c
@@ -558,7 +558,7 @@ reveal_selected_items_callback (gpointer ignored, gpointer user_data)
 			parent_uri = nautilus_file_get_parent_uri (file);
 			if (parent_uri != NULL) {
 				file_as_list = g_list_prepend (NULL, nautilus_file_get_uri (file));
-				nautilus_view_open_in_new_window_and_select
+				nautilus_view_open_location_in_new_window
 					(fm_directory_view_get_nautilus_view (directory_view), 
 					 parent_uri,
 					 file_as_list);
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index fb3a7d9fb..379340439 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -702,7 +702,7 @@ nautilus_window_switch_views (NautilusWindow *window, NautilusViewIdentifier *id
         
         nautilus_window_allow_stop (window, TRUE);
         
-        view = nautilus_window_load_content_view (window, id, NULL);
+        view = nautilus_window_load_content_view (window, id);
         nautilus_window_set_state_info
 		(window,
 		 (NautilusWindowStateItem) NEW_CONTENT_VIEW_ACTIVATED, view,
@@ -1057,7 +1057,6 @@ nautilus_window_back_or_forward (NautilusWindow *window, gboolean back, guint di
 	nautilus_window_begin_location_change
 		(window,
 		 uri,
-		 NULL,
 		 back ? NAUTILUS_LOCATION_CHANGE_BACK : NAUTILUS_LOCATION_CHANGE_FORWARD,
 		 distance);
 
@@ -1326,26 +1325,10 @@ nautilus_window_open_location_callback (NautilusViewFrame *view,
 static void
 nautilus_window_open_location_in_new_window_callback (NautilusViewFrame *view,
 						      const char *location,
+						      GList *selection,
 						      NautilusWindow *window)
 {
-	nautilus_window_open_location_in_new_window (window, location, view);
-}
-
-static void
-nautilus_window_open_in_new_window_and_select_callback (NautilusViewFrame *view,
-						        const char *location,
-						        GList *selection,
-						        NautilusWindow *window)
-{
-	nautilus_window_open_in_new_window_and_select (window, location, selection, view);
-}
-
-static void
-nautilus_window_report_location_change_callback (NautilusViewFrame *view,
-						 const char *location,
-						 NautilusWindow *window)
-{
-	nautilus_window_report_location_change (window, location, view);
+	nautilus_window_open_location_in_new_window (window, location, selection, view);
 }
 
 static void
@@ -1484,8 +1467,6 @@ nautilus_window_connect_view (NautilusWindow *window, NautilusViewFrame *view)
 
 	CONNECT (open_location);
 	CONNECT (open_location_in_new_window);
-	CONNECT (open_in_new_window_and_select);
-	CONNECT (report_location_change);
 	CONNECT (report_selection_change);
 	CONNECT (report_status);
 	CONNECT (report_load_underway);
@@ -1593,7 +1574,7 @@ void
 nautilus_window_reload (NautilusWindow *window)
 {
 	nautilus_window_begin_location_change
-		(window, window->location, NULL,
+		(window, window->location,
 		 NAUTILUS_LOCATION_CHANGE_RELOAD, 0);
 }
 
diff --git a/src/nautilus-navigation-window.h b/src/nautilus-navigation-window.h
index b37941b9a..d6e202560 100644
--- a/src/nautilus-navigation-window.h
+++ b/src/nautilus-navigation-window.h
@@ -118,7 +118,7 @@ struct NautilusWindow {
   
   /* Pending changes */
   NautilusNavigationInfo *pending_ni;
-  NautilusViewFrame *new_content_view, *new_requesting_view;
+  NautilusViewFrame *new_content_view;
   GList *pending_selection;
   GList *new_sidebar_panels;
   GList *error_views;
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index fb3a7d9fb..379340439 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -702,7 +702,7 @@ nautilus_window_switch_views (NautilusWindow *window, NautilusViewIdentifier *id
         
         nautilus_window_allow_stop (window, TRUE);
         
-        view = nautilus_window_load_content_view (window, id, NULL);
+        view = nautilus_window_load_content_view (window, id);
         nautilus_window_set_state_info
 		(window,
 		 (NautilusWindowStateItem) NEW_CONTENT_VIEW_ACTIVATED, view,
@@ -1057,7 +1057,6 @@ nautilus_window_back_or_forward (NautilusWindow *window, gboolean back, guint di
 	nautilus_window_begin_location_change
 		(window,
 		 uri,
-		 NULL,
 		 back ? NAUTILUS_LOCATION_CHANGE_BACK : NAUTILUS_LOCATION_CHANGE_FORWARD,
 		 distance);
 
@@ -1326,26 +1325,10 @@ nautilus_window_open_location_callback (NautilusViewFrame *view,
 static void
 nautilus_window_open_location_in_new_window_callback (NautilusViewFrame *view,
 						      const char *location,
+						      GList *selection,
 						      NautilusWindow *window)
 {
-	nautilus_window_open_location_in_new_window (window, location, view);
-}
-
-static void
-nautilus_window_open_in_new_window_and_select_callback (NautilusViewFrame *view,
-						        const char *location,
-						        GList *selection,
-						        NautilusWindow *window)
-{
-	nautilus_window_open_in_new_window_and_select (window, location, selection, view);
-}
-
-static void
-nautilus_window_report_location_change_callback (NautilusViewFrame *view,
-						 const char *location,
-						 NautilusWindow *window)
-{
-	nautilus_window_report_location_change (window, location, view);
+	nautilus_window_open_location_in_new_window (window, location, selection, view);
 }
 
 static void
@@ -1484,8 +1467,6 @@ nautilus_window_connect_view (NautilusWindow *window, NautilusViewFrame *view)
 
 	CONNECT (open_location);
 	CONNECT (open_location_in_new_window);
-	CONNECT (open_in_new_window_and_select);
-	CONNECT (report_location_change);
 	CONNECT (report_selection_change);
 	CONNECT (report_status);
 	CONNECT (report_load_underway);
@@ -1593,7 +1574,7 @@ void
 nautilus_window_reload (NautilusWindow *window)
 {
 	nautilus_window_begin_location_change
-		(window, window->location, NULL,
+		(window, window->location,
 		 NAUTILUS_LOCATION_CHANGE_RELOAD, 0);
 }
 
diff --git a/src/nautilus-object-window.h b/src/nautilus-object-window.h
index b37941b9a..d6e202560 100644
--- a/src/nautilus-object-window.h
+++ b/src/nautilus-object-window.h
@@ -118,7 +118,7 @@ struct NautilusWindow {
   
   /* Pending changes */
   NautilusNavigationInfo *pending_ni;
-  NautilusViewFrame *new_content_view, *new_requesting_view;
+  NautilusViewFrame *new_content_view;
   GList *pending_selection;
   GList *new_sidebar_panels;
   GList *error_views;
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index fb3a7d9fb..379340439 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -702,7 +702,7 @@ nautilus_window_switch_views (NautilusWindow *window, NautilusViewIdentifier *id
         
         nautilus_window_allow_stop (window, TRUE);
         
-        view = nautilus_window_load_content_view (window, id, NULL);
+        view = nautilus_window_load_content_view (window, id);
         nautilus_window_set_state_info
 		(window,
 		 (NautilusWindowStateItem) NEW_CONTENT_VIEW_ACTIVATED, view,
@@ -1057,7 +1057,6 @@ nautilus_window_back_or_forward (NautilusWindow *window, gboolean back, guint di
 	nautilus_window_begin_location_change
 		(window,
 		 uri,
-		 NULL,
 		 back ? NAUTILUS_LOCATION_CHANGE_BACK : NAUTILUS_LOCATION_CHANGE_FORWARD,
 		 distance);
 
@@ -1326,26 +1325,10 @@ nautilus_window_open_location_callback (NautilusViewFrame *view,
 static void
 nautilus_window_open_location_in_new_window_callback (NautilusViewFrame *view,
 						      const char *location,
+						      GList *selection,
 						      NautilusWindow *window)
 {
-	nautilus_window_open_location_in_new_window (window, location, view);
-}
-
-static void
-nautilus_window_open_in_new_window_and_select_callback (NautilusViewFrame *view,
-						        const char *location,
-						        GList *selection,
-						        NautilusWindow *window)
-{
-	nautilus_window_open_in_new_window_and_select (window, location, selection, view);
-}
-
-static void
-nautilus_window_report_location_change_callback (NautilusViewFrame *view,
-						 const char *location,
-						 NautilusWindow *window)
-{
-	nautilus_window_report_location_change (window, location, view);
+	nautilus_window_open_location_in_new_window (window, location, selection, view);
 }
 
 static void
@@ -1484,8 +1467,6 @@ nautilus_window_connect_view (NautilusWindow *window, NautilusViewFrame *view)
 
 	CONNECT (open_location);
 	CONNECT (open_location_in_new_window);
-	CONNECT (open_in_new_window_and_select);
-	CONNECT (report_location_change);
 	CONNECT (report_selection_change);
 	CONNECT (report_status);
 	CONNECT (report_load_underway);
@@ -1593,7 +1574,7 @@ void
 nautilus_window_reload (NautilusWindow *window)
 {
 	nautilus_window_begin_location_change
-		(window, window->location, NULL,
+		(window, window->location,
 		 NAUTILUS_LOCATION_CHANGE_RELOAD, 0);
 }
 
diff --git a/src/nautilus-spatial-window.h b/src/nautilus-spatial-window.h
index b37941b9a..d6e202560 100644
--- a/src/nautilus-spatial-window.h
+++ b/src/nautilus-spatial-window.h
@@ -118,7 +118,7 @@ struct NautilusWindow {
   
   /* Pending changes */
   NautilusNavigationInfo *pending_ni;
-  NautilusViewFrame *new_content_view, *new_requesting_view;
+  NautilusViewFrame *new_content_view;
   GList *pending_selection;
   GList *new_sidebar_panels;
   GList *error_views;
diff --git a/src/nautilus-view-frame-corba.c b/src/nautilus-view-frame-corba.c
index 7fb734230..5e29fcfbf 100644
--- a/src/nautilus-view-frame-corba.c
+++ b/src/nautilus-view-frame-corba.c
@@ -42,14 +42,8 @@ static void impl_Nautilus_ViewFrame_open_location               (PortableServer_
 								 CORBA_Environment      *ev);
 static void impl_Nautilus_ViewFrame_open_location_in_new_window (PortableServer_Servant  servant,
 								 Nautilus_URI            location,
-								 CORBA_Environment      *ev);
-static void impl_Nautilus_ViewFrame_open_in_new_window_and_select (PortableServer_Servant servant,
-						       		 Nautilus_URI location,
 						       		 const Nautilus_URIList *selection,
 						       		 CORBA_Environment *ev);
-static void impl_Nautilus_ViewFrame_report_location_change      (PortableServer_Servant  servant,
-								 Nautilus_URI            location,
-								 CORBA_Environment      *ev);
 static void impl_Nautilus_ViewFrame_report_selection_change     (PortableServer_Servant  servant,
 								 const Nautilus_URIList *selection,
 								 CORBA_Environment      *ev);
@@ -74,8 +68,6 @@ POA_Nautilus_ViewFrame__epv impl_Nautilus_ViewFrame_epv =
 	NULL,
 	&impl_Nautilus_ViewFrame_open_location,
 	&impl_Nautilus_ViewFrame_open_location_in_new_window,
-	&impl_Nautilus_ViewFrame_open_in_new_window_and_select,
-	&impl_Nautilus_ViewFrame_report_location_change,
 	&impl_Nautilus_ViewFrame_report_selection_change,
 	&impl_Nautilus_ViewFrame_report_status,
 	&impl_Nautilus_ViewFrame_report_load_underway,
@@ -142,6 +134,7 @@ impl_Nautilus_ViewFrame_open_location (PortableServer_Servant servant,
 #if DEBUG_MATHIEU
 	g_print ("open location \n");
 #endif /* DEBUG_MATHIEU */
+
 	nautilus_view_frame_open_location
 		(((impl_POA_Nautilus_ViewFrame *) servant)->view, location);
 }
@@ -149,49 +142,28 @@ impl_Nautilus_ViewFrame_open_location (PortableServer_Servant servant,
 static void
 impl_Nautilus_ViewFrame_open_location_in_new_window (PortableServer_Servant servant,
 						     Nautilus_URI location,
+						     const Nautilus_URIList *selection,
 						     CORBA_Environment *ev)
 {
+	GList *selection_as_g_list;
+
 #if DEBUG_MATHIEU
 	g_print ("open location in new window\n");
 #endif /* DEBUG_MATHIEU */
-	nautilus_view_frame_open_location_in_new_window
-		(((impl_POA_Nautilus_ViewFrame *) servant)->view, location);
-}
 
-static void 
-impl_Nautilus_ViewFrame_open_in_new_window_and_select (PortableServer_Servant servant,
-						       Nautilus_URI location,
-						       const Nautilus_URIList *selection,
-						       CORBA_Environment *ev)
-{
-	GList *selection_as_g_list;
-#if DEBUG_MATHIEU
-	g_print ("open location in new window and select\n");
-#endif /* DEBUG_MATHIEU */
 	selection_as_g_list = nautilus_shallow_g_list_from_uri_list (selection);
-	nautilus_view_frame_open_in_new_window_and_select
+	nautilus_view_frame_open_location_in_new_window
 		(((impl_POA_Nautilus_ViewFrame *) servant)->view, location, selection_as_g_list);
 	g_list_free (selection_as_g_list);
 }
 
 static void
-impl_Nautilus_ViewFrame_report_location_change (PortableServer_Servant servant,
-						Nautilus_URI location,
-						CORBA_Environment *ev)
-{
-#if DEBUG_MATHIEU
-	g_print ("report location change \n");
-#endif /* DEBUG_MATHIEU */
-	nautilus_view_frame_report_location_change
-		(((impl_POA_Nautilus_ViewFrame *) servant)->view, location);
-}
-
-static void
 impl_Nautilus_ViewFrame_report_selection_change (PortableServer_Servant servant,
 						 const Nautilus_URIList *selection,
 						 CORBA_Environment *ev)
 {
 	GList *selection_as_g_list;
+
 #if DEBUG_MATHIEU
 	g_print ("selection change \n");
 #endif /* DEBUG_MATHIEU */
diff --git a/src/nautilus-view-frame-private.h b/src/nautilus-view-frame-private.h
index 79c6c601d..521670639 100644
--- a/src/nautilus-view-frame-private.h
+++ b/src/nautilus-view-frame-private.h
@@ -50,8 +50,6 @@ BonoboObject *impl_Nautilus_ZoomableFrame__create             (NautilusViewFrame
 void          nautilus_view_frame_open_location               (NautilusViewFrame *view,
                                                                const char        *location);
 void          nautilus_view_frame_open_location_in_new_window (NautilusViewFrame *view,
-                                                               const char        *location);
-void          nautilus_view_frame_open_in_new_window_and_select (NautilusViewFrame *view,
                                                                const char        *location,
                                                                GList             *selection);
 void          nautilus_view_frame_report_location_change      (NautilusViewFrame *view,
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index ecbaefe48..8da22b9e3 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -48,8 +48,6 @@
 enum {
 	OPEN_LOCATION,
 	OPEN_LOCATION_IN_NEW_WINDOW,
-	OPEN_IN_NEW_WINDOW_AND_SELECT,
-	REPORT_LOCATION_CHANGE,
 	REPORT_SELECTION_CHANGE,
 	REPORT_STATUS,
 	REPORT_LOAD_UNDERWAY,
@@ -110,24 +108,8 @@ nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass)
 				object_class->type,
 				GTK_SIGNAL_OFFSET (NautilusViewFrameClass, 
 						   open_location_in_new_window),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
-	signals[OPEN_IN_NEW_WINDOW_AND_SELECT] =
-		gtk_signal_new ("open_in_new_window_and_select",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (NautilusViewFrameClass, 
-						   open_in_new_window_and_select),
 				nautilus_gtk_marshal_NONE__STRING_POINTER,
 				GTK_TYPE_NONE, 2, GTK_TYPE_STRING, GTK_TYPE_POINTER);
-	signals[REPORT_LOCATION_CHANGE] =
-		gtk_signal_new ("report_location_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (NautilusViewFrameClass, 
-						   report_location_change),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
 	signals[REPORT_SELECTION_CHANGE] =
 		gtk_signal_new ("report_selection_change",
 				GTK_RUN_LAST,
@@ -855,40 +837,17 @@ nautilus_view_frame_open_location (NautilusViewFrame *view,
 
 void
 nautilus_view_frame_open_location_in_new_window (NautilusViewFrame *view,
-                                                 const char *location)
+                                                 const char *location,
+						 GList *selection)
 {
 	g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
 
 	view_frame_wait_is_over (view);
-	gtk_signal_emit (GTK_OBJECT (view), signals[OPEN_LOCATION_IN_NEW_WINDOW], location);
-}
-
-void
-nautilus_view_frame_open_in_new_window_and_select (NautilusViewFrame *view,
-                                                   const char *location,
-                                                   GList *selection)
-{
-	g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
-
-	view_frame_wait_is_over (view);
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[OPEN_IN_NEW_WINDOW_AND_SELECT],
+	gtk_signal_emit (GTK_OBJECT (view), signals[OPEN_LOCATION_IN_NEW_WINDOW],
 			 location, selection);
 }
 
 void
-nautilus_view_frame_report_location_change (NautilusViewFrame *view,
-                                            const char *location)
-{
-	g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
-
-	set_up_for_new_location (view);
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[REPORT_LOCATION_CHANGE], location);
-	view_frame_underway (view);
-}
-
-void
 nautilus_view_frame_report_selection_change (NautilusViewFrame *view,
                                              GList *selection)
 {
diff --git a/src/nautilus-view-frame.h b/src/nautilus-view-frame.h
index 0ec5ba93b..aa9d6fd4b 100644
--- a/src/nautilus-view-frame.h
+++ b/src/nautilus-view-frame.h
@@ -75,8 +75,6 @@ typedef struct {
         void (* open_location)	               (NautilusViewFrame *view,
                                                 const char *location);
         void (* open_location_in_new_window)   (NautilusViewFrame *view,
-                                                const char *location);
-        void (* open_in_new_window_and_select) (NautilusViewFrame *view,
                                                 const char *location,
                                                 GList *selection); /* list of char * */
         void (* report_location_change)	       (NautilusViewFrame *view,
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 194cffb6b..41546e5ec 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -530,17 +530,11 @@ nautilus_window_update_internals (NautilusWindow *window)
 }
 
 static void
-nautilus_window_update_view (NautilusWindow *window,
-                             NautilusViewFrame *view,
-                             const char *new_location,
-                             GList *new_selection,
-                             NautilusViewFrame *requesting_view,
-                             NautilusViewFrame *content_view)
+update_view (NautilusViewFrame *view,
+             const char *new_location,
+             GList *new_selection)
 {
-        if (view != requesting_view) {
-                nautilus_view_frame_load_location (view, new_location);
-        }
-        
+        nautilus_view_frame_load_location (view, new_location);
         nautilus_view_frame_selection_changed (view, new_selection);
 }
 
@@ -660,8 +654,7 @@ nautilus_window_free_load_info (NautilusWindow *window)
 /* Meta view handling */
 static NautilusViewFrame *
 nautilus_window_load_sidebar_panel (NautilusWindow *window,
-                                    const char *iid,
-                                    NautilusViewFrame *requesting_view)
+                                    const char *iid)
 {
         NautilusViewFrame *sidebar_panel;
         GList *p;
@@ -731,8 +724,7 @@ static void
 open_location (NautilusWindow *window,
                const char *location,
                gboolean force_new_window,
-               GList *new_selection,
-               NautilusViewFrame *view_if_already_loading)
+               GList *new_selection)
 {
         NautilusWindow *traverse_window;
         gboolean create_new_window;
@@ -758,8 +750,6 @@ open_location (NautilusWindow *window,
         }
 
         if (create_new_window) {
-                g_assert (view_if_already_loading == NULL);
-
                 /* Determine if a window with this uri is already open.  If so, activate it */
 		/* FIXME bugzilla.eazel.com 2464: 
 		 * This may be the desired bahavior, but the prefs UI still says open
@@ -775,9 +765,8 @@ open_location (NautilusWindow *window,
 		}
 
 		/* No open window found.  Create a new one. */
-                open_location (
-                	nautilus_application_create_window (window->application), 
-                	location, FALSE, new_selection, NULL);
+                open_location (nautilus_application_create_window (window->application), 
+                               location, FALSE, new_selection);
                 return;
         }
 
@@ -786,7 +775,6 @@ open_location (NautilusWindow *window,
 
         nautilus_window_begin_location_change
                (window, location,
-                view_if_already_loading,
                 NAUTILUS_LOCATION_CHANGE_STANDARD, 0);
 }
 
@@ -795,41 +783,21 @@ nautilus_window_open_location (NautilusWindow *window,
                                const char *location,
                                NautilusViewFrame *view)
 {
-        /* Don't pass along the view because everyone should be told to load. */
-        open_location (window, location, FALSE, NULL, NULL);
+        open_location (window, location, FALSE, NULL);
 }
 
 void
 nautilus_window_open_location_in_new_window (NautilusWindow *window,
                                              const char *location,
+                                             GList *selection,
                                              NautilusViewFrame *view)
 {
-        /* Don't pass along the view because everyone should be told to load. */
-        open_location (window, location, TRUE, NULL, NULL);
-}
-
-void
-nautilus_window_open_in_new_window_and_select (NautilusWindow *window,
-                                               const char *location,
-                                               GList *selection,
-                                               NautilusViewFrame *view)
-{
-        /* Don't pass along the view because everyone should be told to load. */
-        open_location (window, location, TRUE, selection, NULL);
-}
-
-void
-nautilus_window_report_location_change (NautilusWindow *window,
-                                        const char *location,
-                                        NautilusViewFrame *view)
-{
-        open_location (window, location, FALSE, NULL, view);
+        open_location (window, location, TRUE, selection);
 }
 
 NautilusViewFrame *
 nautilus_window_load_content_view (NautilusWindow *window,
-                                   NautilusViewIdentifier *id,
-                                   NautilusViewFrame **requesting_view)
+                                   NautilusViewIdentifier *id)
 {
         const char *iid;
         NautilusViewFrame *content_view;
@@ -868,14 +836,6 @@ nautilus_window_load_content_view (NautilusWindow *window,
         if (!NAUTILUS_IS_VIEW_FRAME (content_view)
             || strcmp (nautilus_view_frame_get_iid (content_view), iid) != 0) {
 
-                if (requesting_view != NULL && *requesting_view == window->content_view) {
-                        /* If we are going to be zapping the old view,
-                         * we definitely don't want any of the new views
-                         * thinking they made the request
-                        */
-                        *requesting_view = NULL;
-                }
-                
                 new_view = nautilus_view_frame_new (window->ui_handler,
                                                     window->application->undo_manager);
                 nautilus_window_connect_view (window, new_view);
@@ -1032,17 +992,13 @@ nautilus_window_update_state (gpointer data)
                         /* Tell previously-notified views to go back to the old page */
                         for (p = window->sidebar_panels; p != NULL; p = p->next) {
                                 if (g_list_find (window->new_sidebar_panels, p->data) != NULL) {
-                                        nautilus_window_update_view (window, p->data,
-                                                                     window->location, window->selection,
-                                                                     NULL, window->content_view);
+                                        update_view (p->data, window->location, window->selection);
                                 }
                         }
                         
-                        if (window->new_content_view
+                        if (window->new_content_view != NULL
                             && window->new_content_view == window->content_view) {
-                                nautilus_window_update_view (window, window->content_view,
-                                                             window->location, window->selection,
-                                                             NULL, window->content_view);
+                                update_view (window->content_view, window->location, window->selection);
                         }
                 }
                 
@@ -1065,8 +1021,7 @@ nautilus_window_update_state (gpointer data)
                     && !window->view_activation_complete) {
 
                         window->new_content_view = nautilus_window_load_content_view
-                                (window, window->pending_ni->initial_content_id,
-                                 &window->new_requesting_view);
+                                (window, window->pending_ni->initial_content_id);
 
 			sidebar_panel_identifiers = 
 				nautilus_global_preferences_get_enabled_sidebar_panel_view_identifiers ();
@@ -1078,7 +1033,7 @@ nautilus_window_update_state (gpointer data)
                                 identifier = (NautilusViewIdentifier *) p->data;
                                 
                                 sidebar_panel = nautilus_window_load_sidebar_panel
-                                        (window, identifier->iid, window->new_requesting_view);
+                                        (window, identifier->iid);
                                 if (sidebar_panel != NULL) {
                                         nautilus_view_frame_set_label (sidebar_panel, identifier->name);
                                         window->new_sidebar_panels = g_list_prepend (window->new_sidebar_panels, sidebar_panel);
@@ -1109,20 +1064,15 @@ nautilus_window_update_state (gpointer data)
                         
                         x_message (("!!! Sending update_view"));
                         
-                        if (window->new_content_view) {
-                                nautilus_window_update_view (window, window->new_content_view,
-                                                             location, selection,
-                                                             window->new_requesting_view, window->new_content_view);
+                        if (window->new_content_view != NULL) {
+                                update_view (window->new_content_view, location, selection);
                         } else {
                                 /* FIXME bugzilla.eazel.com 2457: Silent error here! */
                                 window->cv_progress_error = TRUE;
                         }
                         
                         for (p = window->new_sidebar_panels; p != NULL; p = p->next) {
-                                nautilus_window_update_view (window, p->data,
-                                                             location, selection,
-                                                             window->new_requesting_view,
-                                                             window->new_content_view);
+                                update_view (p->data, location, selection);
                         }
 
                         nautilus_g_list_free_deep (window->pending_selection);
@@ -1464,7 +1414,6 @@ nautilus_window_end_location_change_callback (NautilusNavigationResult result_co
  * Change a window's location.
  * @window: The NautilusWindow whose location should be changed.
  * @loc: A Nautilus_NavigationRequestInfo specifying info about this transition.
- * @requesting_view: The view from which this location change originated, can be NULL.
  * @type: Which type of location change is this? Standard, back, forward, or reload?
  * @distance: If type is back or forward, the index into the back or forward chain. If
  * type is standard or reload, this is ignored, and must be 0.
@@ -1472,7 +1421,6 @@ nautilus_window_end_location_change_callback (NautilusNavigationResult result_co
 void
 nautilus_window_begin_location_change (NautilusWindow *window,
                                        const char *location,
-                                       NautilusViewFrame *requesting_view,
                                        NautilusLocationChangeType type,
                                        guint distance)
 {
@@ -1496,7 +1444,6 @@ nautilus_window_begin_location_change (NautilusWindow *window,
         
         window->location_change_type = type;
         window->location_change_distance = distance;
-        window->new_requesting_view = requesting_view;
         
         nautilus_window_allow_stop (window, TRUE);
         
diff --git a/src/nautilus-window-manage-views.h b/src/nautilus-window-manage-views.h
index db77a8b09..df2bc94aa 100644
--- a/src/nautilus-window-manage-views.h
+++ b/src/nautilus-window-manage-views.h
@@ -34,14 +34,8 @@ void               nautilus_window_open_location               (NautilusWindow
                                                                 NautilusViewFrame       *view);
 void               nautilus_window_open_location_in_new_window (NautilusWindow          *window,
                                                                 const char              *location,
-                                                                NautilusViewFrame       *view);
-void               nautilus_window_open_in_new_window_and_select (NautilusWindow          *window,
-                                                                const char              *location,
                                                                 GList                   *selection,
                                                                 NautilusViewFrame       *view);
-void               nautilus_window_report_location_change      (NautilusWindow          *window,
-                                                                const char              *location,
-                                                                NautilusViewFrame       *view);
 void               nautilus_window_report_selection_change     (NautilusWindow          *window,
                                                                 GList                   *selection,
                                                                 NautilusViewFrame       *view);
@@ -60,7 +54,6 @@ void               nautilus_window_report_load_failed          (NautilusWindow
 void               nautilus_window_title_changed               (NautilusWindow          *window,
                                                                 NautilusViewFrame       *view);
 NautilusViewFrame *nautilus_window_load_content_view           (NautilusWindow          *window,
-                                                                NautilusViewIdentifier  *id,
-                                                                NautilusViewFrame      **requesting_view);
+                                                                NautilusViewIdentifier  *id);
 
 #endif /* NAUTILUS_WINDOW_MANAGE_VIEWS_H */
diff --git a/src/nautilus-window-private.h b/src/nautilus-window-private.h
index 6f8795a96..f7d68bc69 100644
--- a/src/nautilus-window-private.h
+++ b/src/nautilus-window-private.h
@@ -112,7 +112,6 @@ void                 nautilus_window_toolbar_remove_theme_callback     (Nautilus
 NautilusUndoManager *nautilus_window_get_undo_manager                  (NautilusWindow             *window);
 void                 nautilus_window_begin_location_change             (NautilusWindow             *window,
 									const char                 *location,
-									NautilusViewFrame          *requesting_view,
 									NautilusLocationChangeType  type,
 									guint                       distance);
 void		     nautilus_window_remove_bookmarks_menu_callback    (NautilusWindow 		   *window);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index fb3a7d9fb..379340439 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -702,7 +702,7 @@ nautilus_window_switch_views (NautilusWindow *window, NautilusViewIdentifier *id
         
         nautilus_window_allow_stop (window, TRUE);
         
-        view = nautilus_window_load_content_view (window, id, NULL);
+        view = nautilus_window_load_content_view (window, id);
         nautilus_window_set_state_info
 		(window,
 		 (NautilusWindowStateItem) NEW_CONTENT_VIEW_ACTIVATED, view,
@@ -1057,7 +1057,6 @@ nautilus_window_back_or_forward (NautilusWindow *window, gboolean back, guint di
 	nautilus_window_begin_location_change
 		(window,
 		 uri,
-		 NULL,
 		 back ? NAUTILUS_LOCATION_CHANGE_BACK : NAUTILUS_LOCATION_CHANGE_FORWARD,
 		 distance);
 
@@ -1326,26 +1325,10 @@ nautilus_window_open_location_callback (NautilusViewFrame *view,
 static void
 nautilus_window_open_location_in_new_window_callback (NautilusViewFrame *view,
 						      const char *location,
+						      GList *selection,
 						      NautilusWindow *window)
 {
-	nautilus_window_open_location_in_new_window (window, location, view);
-}
-
-static void
-nautilus_window_open_in_new_window_and_select_callback (NautilusViewFrame *view,
-						        const char *location,
-						        GList *selection,
-						        NautilusWindow *window)
-{
-	nautilus_window_open_in_new_window_and_select (window, location, selection, view);
-}
-
-static void
-nautilus_window_report_location_change_callback (NautilusViewFrame *view,
-						 const char *location,
-						 NautilusWindow *window)
-{
-	nautilus_window_report_location_change (window, location, view);
+	nautilus_window_open_location_in_new_window (window, location, selection, view);
 }
 
 static void
@@ -1484,8 +1467,6 @@ nautilus_window_connect_view (NautilusWindow *window, NautilusViewFrame *view)
 
 	CONNECT (open_location);
 	CONNECT (open_location_in_new_window);
-	CONNECT (open_in_new_window_and_select);
-	CONNECT (report_location_change);
 	CONNECT (report_selection_change);
 	CONNECT (report_status);
 	CONNECT (report_load_underway);
@@ -1593,7 +1574,7 @@ void
 nautilus_window_reload (NautilusWindow *window)
 {
 	nautilus_window_begin_location_change
-		(window, window->location, NULL,
+		(window, window->location,
 		 NAUTILUS_LOCATION_CHANGE_RELOAD, 0);
 }
 
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index b37941b9a..d6e202560 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -118,7 +118,7 @@ struct NautilusWindow {
   
   /* Pending changes */
   NautilusNavigationInfo *pending_ni;
-  NautilusViewFrame *new_content_view, *new_requesting_view;
+  NautilusViewFrame *new_content_view;
   GList *pending_selection;
   GList *new_sidebar_panels;
   GList *error_views;