diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-10-10 22:10:51 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-10-10 22:10:51 +0800 |
| commit | acaea79e7129ea2b3eb289a9ea3b2644ac970fba (patch) | |
| tree | e26bd8236f44477a152761e602d7b3740f4e6694 /shell/e-local-storage.c | |
| parent | 6b746897bf30dcf96db4c404dce56c30ecc0c16e (diff) | |
| download | gsoc2013-evolution-acaea79e7129ea2b3eb289a9ea3b2644ac970fba.tar gsoc2013-evolution-acaea79e7129ea2b3eb289a9ea3b2644ac970fba.tar.gz gsoc2013-evolution-acaea79e7129ea2b3eb289a9ea3b2644ac970fba.tar.bz2 gsoc2013-evolution-acaea79e7129ea2b3eb289a9ea3b2644ac970fba.tar.lz gsoc2013-evolution-acaea79e7129ea2b3eb289a9ea3b2644ac970fba.tar.xz gsoc2013-evolution-acaea79e7129ea2b3eb289a9ea3b2644ac970fba.tar.zst gsoc2013-evolution-acaea79e7129ea2b3eb289a9ea3b2644ac970fba.zip | |
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
Diffstat (limited to 'shell/e-local-storage.c')
| -rw-r--r-- | shell/e-local-storage.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |