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, 6 insertions, 34 deletions

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 */