[evolution-mapi/gnome-2-30] Bug #611560 - 'Mark as junk' should be disabled in junk folder

[Milan Crha <mcrha src gnome org>]

commit 303c97ed2366ed04c5bdeccc6e79741795897339
Author: Milan Crha <mcrha redhat com>
Date:   Mon May 3 21:40:12 2010 +0200

    Bug #611560 - 'Mark as junk' should be disabled in junk folder

 src/camel/camel-mapi-folder.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index df86dfb..12fce93 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -2362,6 +2362,12 @@ camel_mapi_folder_new (CamelStore *store, const char *folder_name, const char *f
 
 		if (!strcmp(folder_name, camel_mapi_store_info_full_name (mapi_store->summary, si))) {
 			mapi_folder->type = si->flags;
+			if ((si->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_TRASH)
+				folder->folder_flags |= CAMEL_FOLDER_IS_TRASH;
+			else if ((si->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_JUNK)
+				folder->folder_flags  |= CAMEL_FOLDER_IS_JUNK;
+			camel_store_summary_info_free((CamelStoreSummary *)mapi_store->summary, si);
+			break;
 		}
 
 		camel_store_summary_info_free((CamelStoreSummary *)mapi_store->summary, si);