aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-ops.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 7d1795c3d2..706e51c72b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-04 Dan Winship <danw@helixcode.com>
+
+ * mail-ops.c (do_scan_subfolders): Don't try to add_folders if
+ get_folder_info returned NULL.
+
2000-10-04 Not Zed <NotZed@HelixCode.com>
* message-list.c (message_list_init_header): Fix the attachment icon width.
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index d8a45412ff..3417506a4d 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1236,8 +1236,10 @@ do_scan_subfolders (gpointer in_data, gpointer op_data, CamelException *ex)
return;
tree = camel_store_get_folder_info (store, NULL, TRUE, TRUE, ex);
- add_folders (data->new_folders, "", tree);
- camel_store_free_folder_info (store, tree);
+ if (tree) {
+ add_folders (data->new_folders, "", tree);
+ camel_store_free_folder_info (store, tree);
+ }
/* FIXME: We intentionally lose a reference to the store here
* for the benefit of the IMAP provider. Undo this when the