aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/e-folder-tree.c4
2 files changed, 10 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index a3959bea83..513d09e083 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-14 jacob berkman <jacob@ximian.com>
+
+ * e-folder-tree.c (remove_folder): set the subfolder's parent to
+ NULL so the subfolder list doesn't change whilst we are using it
+ (folder_remove_subfolder): this function didn't used to work at
+ all
+
2001-05-12 Chris Toshok <toshok@ximian.com>
* e-storage-set-view.c (tree_drag_data_received): implement the
diff --git a/shell/e-folder-tree.c b/shell/e-folder-tree.c
index bdafea8734..e878bd24d6 100644
--- a/shell/e-folder-tree.c
+++ b/shell/e-folder-tree.c
@@ -107,7 +107,8 @@ static void
folder_remove_subfolder (Folder *folder,
Folder *subfolder)
{
- g_list_remove (folder->subfolders, folder);
+ folder->subfolders = g_list_remove (folder->subfolders, subfolder);
+ subfolder->parent = NULL;
}
static void
@@ -142,6 +143,7 @@ remove_folder (EFolderTree *folder_tree,
Folder *subfolder;
subfolder = (Folder *) p->data;
+ subfolder->parent = NULL;
remove_folder (folder_tree, subfolder);
}