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.

1 files changed, 4 insertions, 23 deletions

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);
 }