diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-ops.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index ae91bbd43e..c759729f69 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-03-06 Dan Winship <danw@ximian.com> + + * mail-ops.c (get_folderinfo_got): If the folderinfo has no URL + (ie, can't contain messages), don't add it as a vtrash source. + 2001-03-05 Jeffrey Stedfast <fejj@ximian.com> * mail-config-druid.c: Don't access the `active` data member of a diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 1d2516272a..5c1d82784a 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -928,9 +928,6 @@ add_vtrash_info (CamelFolderInfo *info) CamelURL *url; char *uri; - if (!info) - return; - for (fi = info; fi->sibling; fi = fi->sibling) { if (!strcmp (fi->name, "vTrash")) return; @@ -961,7 +958,8 @@ static void get_folderinfo_get(struct _mail_msg *mm) camel_operation_register(mm->cancel); m->info = camel_store_get_folder_info(m->store, NULL, FALSE, TRUE, TRUE, &mm->ex); - add_vtrash_info (m->info); + if (m->info && m->info->url) + add_vtrash_info (m->info); camel_operation_unregister(mm->cancel); } |