From acaea79e7129ea2b3eb289a9ea3b2644ac970fba Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 10 Oct 2001 14:10:51 +0000 Subject: Make this a no-op if the source and the destination path are the same. * e-storage.c (e_storage_async_xfer_folder): Make this a no-op if the source and the destination path are the same. * e-local-storage.c (impl_async_xfer_folder): return after returning `E_STORAGE_CANTCHANGESTOCKFOLDER' to the callback. * e-storage-set-view.c (handle_evolution_path_drag_motion): Make the check for dragging a folder over itself a little bit more accurate. svn path=/trunk/; revision=13550 --- shell/e-local-storage.c | 6 +++--- 1 file changed, 3 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 94c7523756..c7fcf730d7 100644 --- a/shell/e-local-storage.c +++ b/shell/e-local-storage.c @@ -839,8 +839,6 @@ async_xfer_folder_callback (EvolutionShellComponentClient *shell_component_clien char *dest_physical_path; char *new_physical_uri; - /* FIXME handle errors. */ - xfer_data = (XferData *) callback_data; item = (XferItem *) xfer_data->current_folder_item->data; @@ -892,8 +890,10 @@ impl_async_xfer_folder (EStorage *storage, local_storage = E_LOCAL_STORAGE (storage); priv = local_storage->priv; - if (remove_source && e_folder_get_is_stock (e_storage_get_folder (storage, source_path))) + if (remove_source && e_folder_get_is_stock (e_storage_get_folder (storage, source_path))) { (* callback) (storage, E_STORAGE_CANTCHANGESTOCKFOLDER, callback_data); + return; + } folder_items = NULL; append_xfer_item_list (storage, g_strdup (source_path), g_strdup (destination_path), &folder_items); -- cgit