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-local-storage.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'shell/e-local-storage.c') diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c index c3c73954c8..c06edcca9a 100644 --- a/shell/e-local-storage.c +++ b/shell/e-local-storage.c @@ -791,7 +791,6 @@ async_xfer_folder_complete (XferData *xfer_data) local_storage = xfer_data->local_storage; -#if 0 if (xfer_data->remove_source) { EStorageResult result; @@ -807,11 +806,14 @@ async_xfer_folder_complete (XferData *xfer_data) /* FIXME handle failure differently? This should be n unlikely situation. */ - if (result == E_STORAGE_OK) + if (result == E_STORAGE_OK) { e_storage_removed_folder (E_STORAGE (local_storage), item->source_path); + + evolution_storage_removed_folder (EVOLUTION_STORAGE (local_storage->priv->bonobo_interface), + item->source_path); + } } } -#endif /* Free the data. */ -- cgit v1.2.3