aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2001-03-07 01:20:51 +0800
committerDan Winship <danw@src.gnome.org>2001-03-07 01:20:51 +0800
commite5fbbdf9c1b9460fea229a1a80dc6bb4f28c9823 (patch)
tree7eaa2038abe94303a013e3fa83c85f39ecffe492 /mail
parentc8949ea9cef8d432002d956dd4a79ca89ca92fec (diff)
downloadgsoc2013-evolution-e5fbbdf9c1b9460fea229a1a80dc6bb4f28c9823.tar
gsoc2013-evolution-e5fbbdf9c1b9460fea229a1a80dc6bb4f28c9823.tar.gz
gsoc2013-evolution-e5fbbdf9c1b9460fea229a1a80dc6bb4f28c9823.tar.bz2
gsoc2013-evolution-e5fbbdf9c1b9460fea229a1a80dc6bb4f28c9823.tar.lz
gsoc2013-evolution-e5fbbdf9c1b9460fea229a1a80dc6bb4f28c9823.tar.xz
gsoc2013-evolution-e5fbbdf9c1b9460fea229a1a80dc6bb4f28c9823.tar.zst
gsoc2013-evolution-e5fbbdf9c1b9460fea229a1a80dc6bb4f28c9823.zip
If the folderinfo has no URL (ie, can't contain messages), don't add it as
* 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. svn path=/trunk/; revision=8569
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-ops.c6
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);
}