aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog9
-rw-r--r--shell/e-local-storage.c5
2 files changed, 9 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index ec728b43a1..cb25fd0230 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,14 @@
2001-07-06 Ettore Perazzoli <ettore@ximian.com>
+ [This should fix #3873, Bizzarre crash after deleting a few
+ folders.]
+
+ * e-local-storage.c (remove_folder): Don't free the
+ `physical_path' on error, as it gets freed when freeing the
+ callback data.
+
+2001-07-06 Ettore Perazzoli <ettore@ximian.com>
+
[Fix #3959, copying a folder over itself crashes Evolution.]
* e-shell-folder-commands.c
diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c
index 201103ce30..854fb35700 100644
--- a/shell/e-local-storage.c
+++ b/shell/e-local-storage.c
@@ -504,11 +504,6 @@ remove_folder (ELocalStorage *local_storage,
result = remove_folder_directory (E_LOCAL_STORAGE (local_storage), path);
- if (result != E_STORAGE_OK) {
- g_free (physical_path);
- return result;
- }
-
return result;
}