From 3b17294f868cf76f0784aed9465bcf79f88cf37d Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Tue, 4 Sep 2001 15:30:13 +0000 Subject: Remove the folder from the EvolutionStorage as well as the EStorage. 2001-08-30 Peter Williams * e-local-storage.c (async_xfer_folder_complete): Remove the folder from the EvolutionStorage as well as the EStorage. 2001-08-29 Peter Williams * e-storage-set-view.c (etree_node_destroy_func): Only call remove_node_from_hash if it's not the root node. (removed_storage_cb): Don't remove the node from the hash here, because it will be removed in the node_destroyed callback. (removed_folder_cb): Same. * e-shell-view.c (e_shell_view_remove_control_for_uri): Disconnect from the destroy signal so as not to confuse ourselves. Also, the page remove in the notebook destroys the control and the socket, so don't do that explicitly. * e-shell-folder-commands.c (folder_selection_dialog_folder_selected_callback): Remove the control for the source view if we're moving. svn path=/trunk/; revision=12578 --- shell/e-shell-folder-commands.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'shell/e-shell-folder-commands.c') diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c index e0472c6a73..861e2cd3b8 100644 --- a/shell/e-shell-folder-commands.c +++ b/shell/e-shell-folder-commands.c @@ -194,6 +194,10 @@ folder_selection_dialog_folder_selected_callback (EShellFolderSelectionDialog *f storage_set = e_shell_get_storage_set (folder_command_data->shell); + if (remove_source) + e_shell_view_remove_control_for_uri (folder_command_data->shell_view, + e_shell_view_get_current_uri (folder_command_data->shell_view)); + e_storage_set_async_xfer_folder (storage_set, folder_command_data->source_path, folder_command_data->destination_path, -- cgit v1.2.3