[nautilus] Revert "Pass the window instead of the view to action callbacks."

[Alexander Larsson <alexl src gnome org>]

commit ce2e90c30506cbce28addf3258938824a1a61494
Author: Alexander Larsson <alexl redhat com>
Date:   Wed Dec 16 12:34:16 2009 +0100

    Revert "Pass the window instead of the view to action callbacks."
    
    This reverts commit f3390c4f9a277ffd95bc5f3c6e475d9dad7d8935.
    
    It makes no sense to pass the window for all view specific callbacks.
    If anything needs to access the window that is easily doable from
    the view reference.
    
    Conflicts:
    
    	src/file-manager/fm-directory-view.c

 src/file-manager/fm-directory-view.c |  268 ++++++++++++---------------------
 1 files changed, 98 insertions(+), 170 deletions(-)
---
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 67215ff..7036086 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -428,18 +428,6 @@ typedef struct {
 	FMDirectoryView *directory_view;
 } CreateTemplateParameters;
 
-static FMDirectoryView*
-get_active_directory_view (NautilusWindowInfo *window_info)
-{
-	NautilusWindowSlotInfo *slot_info;
-	NautilusView *view;
-	
-	slot_info = nautilus_window_info_get_active_slot (window_info);
-	view = nautilus_window_slot_info_get_current_view (slot_info);
-	
-	return FM_IS_DIRECTORY_VIEW (view) ? FM_DIRECTORY_VIEW (view) : NULL;
-}
-
 static ApplicationLaunchParameters *
 application_launch_parameters_new (GAppInfo *application,
 			      	   GList *files,
@@ -767,8 +755,7 @@ action_open_callback (GtkAction *action,
 	GList *selection;
 	FMDirectoryView *view;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	selection = fm_directory_view_get_selection (view);
 	fm_directory_view_activate_files (view,
@@ -786,8 +773,7 @@ action_open_close_parent_callback (GtkAction *action,
 	GList *selection;
 	FMDirectoryView *view;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	selection = fm_directory_view_get_selection (view);
 	fm_directory_view_activate_files (view,
@@ -807,9 +793,7 @@ action_open_alternate_callback (GtkAction *action,
 	GList *selection;
 	GtkWindow *window;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
-
+	view = FM_DIRECTORY_VIEW (callback_data);
 	selection = fm_directory_view_get_selection (view);
 
 	window = fm_directory_view_get_containing_window (view);
@@ -833,9 +817,7 @@ action_open_new_tab_callback (GtkAction *action,
 		return;
 	}
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
-
+	view = FM_DIRECTORY_VIEW (callback_data);
 	selection = fm_directory_view_get_selection (view);
 
 	window = fm_directory_view_get_containing_window (view);
@@ -859,9 +841,7 @@ action_open_folder_window_callback (GtkAction *action,
 	GList *selection;
 	GtkWindow *window;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
-
+	view = FM_DIRECTORY_VIEW (callback_data);
 	selection = fm_directory_view_get_selection (view);
 
 	window = fm_directory_view_get_containing_window (view);
@@ -969,12 +949,9 @@ static void
 action_other_application_callback (GtkAction *action,
 				   gpointer callback_data)
 {
-	FMDirectoryView *view;
-    
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
 
-	open_with_other_program (view);
+	open_with_other_program (FM_DIRECTORY_VIEW (callback_data));
 }
 
 static void
@@ -1015,12 +992,7 @@ static void
 action_trash_callback (GtkAction *action,
 		       gpointer callback_data)
 {
-	FMDirectoryView *view;
-
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
-
-	trash_or_delete_selected_files (view);
+        trash_or_delete_selected_files (FM_DIRECTORY_VIEW (callback_data));
 }
 
 static void
@@ -1052,12 +1024,7 @@ static void
 action_delete_callback (GtkAction *action,
 			gpointer callback_data)
 {
-	FMDirectoryView *view;
-
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
-
-	delete_selected_files (view);
+        delete_selected_files (FM_DIRECTORY_VIEW (callback_data));
 }
 
 static void
@@ -1067,8 +1034,7 @@ action_restore_from_trash_callback (GtkAction *action,
 	FMDirectoryView *view;
 	GList *selection;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	selection = fm_directory_view_get_selection_for_file_transfer (view);
 	restore_from_trash (selection, view);
@@ -1100,9 +1066,7 @@ action_duplicate_callback (GtkAction *action,
         GList *selection;
         GArray *selected_item_locations;
  
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
-
+        view = FM_DIRECTORY_VIEW (callback_data);
 	selection = fm_directory_view_get_selection_for_file_transfer (view);
 	if (selection_not_empty_in_menu_callback (view, selection)) {
 		/* FIXME bugzilla.gnome.org 45061:
@@ -1127,9 +1091,9 @@ action_create_link_callback (GtkAction *action,
         GList *selection;
         GArray *selected_item_locations;
         
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+        g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
 
+        view = FM_DIRECTORY_VIEW (callback_data);
 	selection = fm_directory_view_get_selection (view);
 	if (selection_not_empty_in_menu_callback (view, selection)) {
 		selected_item_locations = fm_directory_view_get_selected_icon_locations (view);
@@ -1144,24 +1108,18 @@ static void
 action_select_all_callback (GtkAction *action, 
 			    gpointer callback_data)
 {
-	FMDirectoryView *view;
-
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
 
-	fm_directory_view_select_all (view);
+	fm_directory_view_select_all (callback_data);
 }
 
 static void
 action_invert_selection_callback (GtkAction *action,
 				  gpointer callback_data)
 {
-	FMDirectoryView *view;
-
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
 
-	fm_directory_view_invert_selection (view);
+	fm_directory_view_invert_selection (callback_data);
 }
 
 
@@ -1258,24 +1216,18 @@ static void
 action_select_pattern_callback (GtkAction *action, 
 				gpointer callback_data)
 {
-	FMDirectoryView *view;
-	
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
 
-	select_pattern(view);
+	select_pattern(callback_data);
 }
 
 static void
 action_reset_to_defaults_callback (GtkAction *action, 
 				   gpointer callback_data)
 {
-	FMDirectoryView *view;
-
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
 
-	fm_directory_view_reset_to_defaults (view);
+	fm_directory_view_reset_to_defaults (callback_data);
 }
 
 
@@ -1297,8 +1249,7 @@ action_save_search_callback (GtkAction *action,
 	NautilusSearchDirectory *search;
 	FMDirectoryView	*directory_view;
 	
-	directory_view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (directory_view));
+        directory_view = FM_DIRECTORY_VIEW (callback_data);
 
 	if (directory_view->details->model &&
 	    NAUTILUS_IS_SEARCH_DIRECTORY (directory_view->details->model)) {
@@ -1336,8 +1287,7 @@ action_save_search_as_callback (GtkAction *action,
 	char *filename, *filename_utf8, *dirname, *path, *uri;
 	GFile *location;
 	
-	directory_view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (directory_view));
+        directory_view = FM_DIRECTORY_VIEW (callback_data);
 
 	if (directory_view->details->model &&
 	    NAUTILUS_IS_SEARCH_DIRECTORY (directory_view->details->model)) {
@@ -1432,36 +1382,27 @@ static void
 action_empty_trash_callback (GtkAction *action,
 			     gpointer callback_data)
 {                
-	FMDirectoryView *view;
-	
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
-	
-	nautilus_file_operations_empty_trash (GTK_WIDGET (view));
+        g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
+
+	nautilus_file_operations_empty_trash (GTK_WIDGET (callback_data));
 }
 
 static void
 action_new_folder_callback (GtkAction *action,
 			    gpointer callback_data)
 {                
-	FMDirectoryView *view;
+        g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
-
-	fm_directory_view_new_folder (view);
+	fm_directory_view_new_folder (FM_DIRECTORY_VIEW (callback_data));
 }
 
 static void
 action_new_empty_file_callback (GtkAction *action,
 				gpointer callback_data)
 {                
-	FMDirectoryView *view;
-
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+        g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
 
-	fm_directory_view_new_file (view, NULL, NULL);
+	fm_directory_view_new_file (FM_DIRECTORY_VIEW (callback_data), NULL, NULL);
 }
 
 static void
@@ -1472,8 +1413,9 @@ action_new_launcher_callback (GtkAction *action,
 	FMDirectoryView *view;
 	GtkWindow *window;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
+
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	parent_uri = fm_directory_view_get_backing_uri (view);
 
@@ -1496,9 +1438,9 @@ action_properties_callback (GtkAction *action,
         FMDirectoryView *view;
         GList *selection;
         
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+        g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
 
+        view = FM_DIRECTORY_VIEW (callback_data);
 	selection = fm_directory_view_get_selection (view);
 
 	fm_properties_window_present (selection, GTK_WIDGET (view));
@@ -1513,8 +1455,9 @@ action_self_properties_callback (GtkAction *action,
 	FMDirectoryView *view;
 	GList           *files;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
+
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	if (view->details->directory_as_file != NULL) {
 		files = g_list_append (NULL, nautilus_file_ref (view->details->directory_as_file));
@@ -1532,9 +1475,9 @@ action_location_properties_callback (GtkAction *action,
 	FMDirectoryView *view;
 	GList           *files;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
 
+	view = FM_DIRECTORY_VIEW (callback_data);
 	g_assert (NAUTILUS_IS_FILE (view->details->location_popup_directory_as_file));
 
 	files = g_list_append (NULL, nautilus_file_ref (view->details->location_popup_directory_as_file));
@@ -5707,8 +5650,7 @@ action_open_scripts_folder_callback (GtkAction *action,
 {      
 	FMDirectoryView *view;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	open_location (view, scripts_directory_uri, NAUTILUS_WINDOW_OPEN_ACCORDING_TO_MODE, 0);
 	
@@ -5929,7 +5871,6 @@ action_copy_files (GtkAction *action,
 		   FMDirectoryView *view)
 {
 	GList *selection;
-
 	g_assert (FM_IS_DIRECTORY_VIEW (view));
 
 	selection = fm_directory_view_get_selection_for_file_transfer (view);
@@ -5941,7 +5882,14 @@ static void
 action_copy_files_callback (GtkAction *action,
 			    gpointer callback_data)
 {
-	action_copy_files (action, get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data)));
+	FMDirectoryView *view;
+	GList *selection;
+
+	view = FM_DIRECTORY_VIEW (callback_data);
+
+	selection = fm_directory_view_get_selection_for_file_transfer (view);
+	copy_or_cut_files (view, selection, FALSE);
+	nautilus_file_list_free (selection);
 }
 
 static void
@@ -5993,7 +5941,7 @@ action_copy_to_next_pane_callback (GtkAction *action, gpointer callback_data)
 {
 	FMDirectoryView *view;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
+	view = FM_DIRECTORY_VIEW (callback_data);
 	move_copy_selection_to_next_pane (view,
 					  GDK_ACTION_COPY);
 }
@@ -6005,7 +5953,7 @@ action_move_to_next_pane_callback (GtkAction *action, gpointer callback_data)
 	char *dest_location;
 	FMDirectoryView *view;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	slot = nautilus_window_info_get_extra_slot (fm_directory_view_get_nautilus_window (view));
 	g_return_if_fail (slot != NULL);
@@ -6022,7 +5970,7 @@ action_copy_to_home_callback (GtkAction *action, gpointer callback_data)
 	FMDirectoryView *view;
 	char *dest_location;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	dest_location = nautilus_get_home_directory_uri ();
 	move_copy_selection_to_location (view, GDK_ACTION_COPY, dest_location);
@@ -6035,7 +5983,7 @@ action_move_to_home_callback (GtkAction *action, gpointer callback_data)
 	FMDirectoryView *view;
 	char *dest_location;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	dest_location = nautilus_get_home_directory_uri ();
 	move_copy_selection_to_location (view, GDK_ACTION_MOVE, dest_location);
@@ -6048,7 +5996,7 @@ action_copy_to_desktop_callback (GtkAction *action, gpointer callback_data)
 	FMDirectoryView *view;
 	char *dest_location;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	dest_location = nautilus_get_desktop_directory_uri ();
 	move_copy_selection_to_location (view, GDK_ACTION_COPY, dest_location);
@@ -6061,7 +6009,7 @@ action_move_to_desktop_callback (GtkAction *action, gpointer callback_data)
 	FMDirectoryView *view;
 	char *dest_location;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	dest_location = nautilus_get_desktop_directory_uri ();
 	move_copy_selection_to_location (view, GDK_ACTION_MOVE, dest_location);
@@ -6085,7 +6033,14 @@ static void
 action_cut_files_callback (GtkAction *action,
 			   gpointer callback_data)
 {
-	action_cut_files (action, get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data)));
+	FMDirectoryView *view;
+	GList *selection;
+
+	view = FM_DIRECTORY_VIEW (callback_data);
+
+	selection = fm_directory_view_get_selection_for_file_transfer (view);
+	copy_or_cut_files (view, selection, TRUE);
+	nautilus_file_list_free (selection);
 }
 
 static void
@@ -6187,7 +6142,15 @@ static void
 action_paste_files_callback (GtkAction *action,
 			     gpointer callback_data)
 {
-	action_paste_files (action, get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data)));
+	FMDirectoryView *view;
+
+	view = FM_DIRECTORY_VIEW (callback_data);
+
+	g_object_ref (view);
+	gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)),
+					copied_files_atom,
+					paste_clipboard_received_callback,
+					view);
 }
 
 static void
@@ -6217,9 +6180,7 @@ action_paste_files_into_callback (GtkAction *action,
 	FMDirectoryView *view;
 	GList *selection;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
-
+	view = FM_DIRECTORY_VIEW (callback_data);
 	selection = fm_directory_view_get_selection (view);
 	if (selection != NULL) {
 		paste_into (view, NAUTILUS_FILE (selection->data));
@@ -6256,24 +6217,14 @@ static void
 action_rename_callback (GtkAction *action,
 			gpointer callback_data)
 {
-	FMDirectoryView *view;
-
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
-
-	real_action_rename (FM_DIRECTORY_VIEW (view), FALSE);
+	real_action_rename (FM_DIRECTORY_VIEW (callback_data), FALSE);
 }
 
 static void
 action_rename_select_all_callback (GtkAction *action,
 				   gpointer callback_data)
 {
-	FMDirectoryView *view;
-
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
-
-	real_action_rename (FM_DIRECTORY_VIEW (view), TRUE);
+	real_action_rename (FM_DIRECTORY_VIEW (callback_data), TRUE);
 }
 
 static void
@@ -6346,8 +6297,7 @@ action_mount_volume_callback (GtkAction *action,
 	FMDirectoryView *view;
 	GMountOperation *mount_op;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+        view = FM_DIRECTORY_VIEW (data);
 	
 	selection = fm_directory_view_get_selection (view);
 	for (l = selection; l != NULL; l = l->next) {
@@ -6371,8 +6321,7 @@ action_unmount_volume_callback (GtkAction *action,
 	GList *selection, *l;
 	FMDirectoryView *view;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+        view = FM_DIRECTORY_VIEW (data);
 	
 	selection = fm_directory_view_get_selection (view);
 
@@ -6398,8 +6347,7 @@ action_format_volume_callback (GtkAction *action,
 	GList *selection, *l;
 	FMDirectoryView *view;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+        view = FM_DIRECTORY_VIEW (data);
 	
 	selection = fm_directory_view_get_selection (view);
 	for (l = selection; l != NULL; l = l->next) {
@@ -6421,8 +6369,7 @@ action_eject_volume_callback (GtkAction *action,
 	GList *selection, *l;
 	FMDirectoryView *view;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+        view = FM_DIRECTORY_VIEW (data);
 	
 	selection = fm_directory_view_get_selection (view);
 	for (l = selection; l != NULL; l = l->next) {
@@ -6534,8 +6481,7 @@ action_self_mount_volume_callback (GtkAction *action,
 	FMDirectoryView *view;
 	GMountOperation *mount_op;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (data);
 
 	file = fm_directory_view_get_directory_as_file (view);
 	if (file == NULL) {
@@ -6555,8 +6501,7 @@ action_self_unmount_volume_callback (GtkAction *action,
 	FMDirectoryView *view;
 	GMountOperation *mount_op;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (data);
 
 	file = fm_directory_view_get_directory_as_file (view);
 	if (file == NULL) {
@@ -6576,8 +6521,7 @@ action_self_eject_volume_callback (GtkAction *action,
 	FMDirectoryView *view;
 	GMountOperation *mount_op;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (data);
 
 	file = fm_directory_view_get_directory_as_file (view);
 	if (file == NULL) {
@@ -6596,8 +6540,7 @@ action_self_format_volume_callback (GtkAction *action,
 	NautilusFile *file;
 	FMDirectoryView *view;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (data);
 
 	file = fm_directory_view_get_directory_as_file (view);
 	if (file == NULL) {
@@ -6677,8 +6620,7 @@ action_location_mount_volume_callback (GtkAction *action,
 	FMDirectoryView *view;
 	GMountOperation *mount_op;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (data);
 
 	file = view->details->location_popup_directory_as_file;
 	if (file == NULL) {
@@ -6698,8 +6640,7 @@ action_location_unmount_volume_callback (GtkAction *action,
 	FMDirectoryView *view;
 	GMountOperation *mount_op;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (data);
 
 	file = view->details->location_popup_directory_as_file;
 	if (file == NULL) {
@@ -6720,8 +6661,7 @@ action_location_eject_volume_callback (GtkAction *action,
 	FMDirectoryView *view;
 	GMountOperation *mount_op;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (data);
 
 	file = view->details->location_popup_directory_as_file;
 	if (file == NULL) {
@@ -6741,8 +6681,7 @@ action_location_format_volume_callback (GtkAction *action,
 	NautilusFile *file;
 	FMDirectoryView *view;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (data);
 
 	file = view->details->location_popup_directory_as_file;
 	if (file == NULL) {
@@ -6873,8 +6812,7 @@ action_connect_to_server_link_callback (GtkAction *action,
 	GtkWidget *box;
 	char *title;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+        view = FM_DIRECTORY_VIEW (data);
 	
 	selection = fm_directory_view_get_selection (view);
 
@@ -6949,8 +6887,7 @@ action_location_open_alternate_callback (GtkAction *action,
 	FMDirectoryView *view;
 	NautilusFile *file;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	file = view->details->location_popup_directory_as_file;
 	if (file == NULL) {
@@ -6970,8 +6907,7 @@ action_location_open_in_new_tab_callback (GtkAction *action,
 	FMDirectoryView *view;
 	NautilusFile *file;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	file = view->details->location_popup_directory_as_file;
 	if (file == NULL) {
@@ -6991,8 +6927,7 @@ action_location_open_folder_window_callback (GtkAction *action,
 	FMDirectoryView *view;
 	NautilusFile *file;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	file = view->details->location_popup_directory_as_file;
 	g_return_if_fail (file != NULL);
@@ -7011,8 +6946,7 @@ action_location_cut_callback (GtkAction *action,
 	NautilusFile *file;
 	GList *files;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	file = view->details->location_popup_directory_as_file;
 	g_return_if_fail (file != NULL);
@@ -7030,8 +6964,7 @@ action_location_copy_callback (GtkAction *action,
 	NautilusFile *file;
 	GList *files;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	file = view->details->location_popup_directory_as_file;
 	g_return_if_fail (file != NULL);
@@ -7048,8 +6981,7 @@ action_location_paste_files_into_callback (GtkAction *action,
 	FMDirectoryView *view;
 	NautilusFile *file;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	file = view->details->location_popup_directory_as_file;
 	g_return_if_fail (file != NULL);
@@ -7065,8 +6997,7 @@ action_location_trash_callback (GtkAction *action,
 	NautilusFile *file;
 	GList *files;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	file = view->details->location_popup_directory_as_file;
 	g_return_if_fail (file != NULL);
@@ -7087,8 +7018,7 @@ action_location_delete_callback (GtkAction *action,
 	GFile *location;
 	GList *files;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
+	view = FM_DIRECTORY_VIEW (callback_data);
 
 	file = view->details->location_popup_directory_as_file;
 	g_return_if_fail (file != NULL);
@@ -7179,9 +7109,7 @@ action_location_restore_from_trash_callback (GtkAction *action,
 	NautilusFile *file;
 	GList l;
 
-	view = get_active_directory_view (NAUTILUS_WINDOW_INFO (callback_data));
-	g_assert (FM_IS_DIRECTORY_VIEW (view));
-    
+	view = FM_DIRECTORY_VIEW (callback_data);
 	file = view->details->location_popup_directory_as_file;
 
 	l.prev = NULL;
@@ -7611,7 +7539,7 @@ real_merge_menus (FMDirectoryView *view)
 	view->details->dir_action_group = action_group;
 	gtk_action_group_add_actions (action_group, 
 				      directory_view_entries, G_N_ELEMENTS (directory_view_entries),
-				      view->details->window);
+				      view);
 
 	/* Translators: %s is a directory */
 	tooltip = g_strdup_printf (_("Run or manage scripts from %s"), "~/.gnome2/nautilus-scripts");