aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-callbacks.c15
2 files changed, 17 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 96fc9d4e71..b45018c94c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-06 Jason Leach <jleach@ximian.com>
+
+ * mail-callbacks.c (create_folders): Make vtrash folders on other
+ storages with a "vtrash" type, so they get the little trashcan
+ icon.
+
2001-08-06 Peter Williams <peterw@ximian.com>
* subscribe-dialog.[ch]: Reimplement to be asynchronous and pretty,
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index b225c9bd98..56c5516d87 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -2078,10 +2078,17 @@ create_folders (EvolutionStorage *storage, const char *prefix, CamelFolderInfo *
mail_folder_cache_note_folderinfo (fi->url, fi);
path = g_strdup_printf ("%s/%s", prefix, fi->name);
- evolution_storage_new_folder (storage, path, fi->name,
- "mail", fi->url,
- fi->name, /* description */
- fi->unread_message_count > 0);
+
+ if (!strncmp (fi->url, "vtrash:", 7))
+ evolution_storage_new_folder (storage, path, fi->name,
+ "vtrash", fi->url,
+ fi->name, /* description */
+ fi->unread_message_count > 0);
+ else
+ evolution_storage_new_folder (storage, path, fi->name,
+ "mail", fi->url,
+ fi->name, /* description */
+ fi->unread_message_count > 0);
if (fi->child)
create_folders (storage, path, fi->child);