[evolution-data-server] Store Junk and NotJunk flags in IMAP server

[David Woodhouse <dwmw2 src gnome org>]

commit bed388e3a851596e1163fed8ee57cb41c81b9b10
Author: David Woodhouse <David Woodhouse intel com>
Date:   Wed Jun 30 20:22:36 2010 +0100

    Store Junk and NotJunk flags in IMAP server
    
    Strictly speaking we shouldn't be doing this if the server won't understand
    them and doesn't have \* in PERMANENTFLAGS -- but there are already bugs with
    that anyway, when we try to set receipt-handled. I'll get to that shortly...

 camel/providers/imapx/camel-imapx-server.c  |    4 +++-
 camel/providers/imapx/camel-imapx-summary.h |    1 +
 camel/providers/imapx/camel-imapx-utils.c   |    2 ++
 3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 35a9fab..4d248a2 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -4136,7 +4136,9 @@ static struct {
 	{ "\\DRAFT", CAMEL_MESSAGE_DRAFT },
 	{ "\\FLAGGED", CAMEL_MESSAGE_FLAGGED },
 	{ "\\SEEN", CAMEL_MESSAGE_SEEN },
-	{ "\\RECENT", CAMEL_IMAPX_MESSAGE_RECENT }
+	{ "\\RECENT", CAMEL_IMAPX_MESSAGE_RECENT },
+	{ "JUNK", CAMEL_MESSAGE_JUNK },
+	{ "NOTJUNK", CAMEL_MESSAGE_NOTJUNK }
 };
 
 /*
diff --git a/camel/providers/imapx/camel-imapx-summary.h b/camel/providers/imapx/camel-imapx-summary.h
index 438900c..dc145ba 100644
--- a/camel/providers/imapx/camel-imapx-summary.h
+++ b/camel/providers/imapx/camel-imapx-summary.h
@@ -47,6 +47,7 @@
 #define CAMEL_IMAPX_SERVER_FLAGS \
 	(CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_DELETED | \
 	 CAMEL_MESSAGE_DRAFT | CAMEL_MESSAGE_FLAGGED | \
+	 CAMEL_MESSAGE_JUNK | CAMEL_MESSAGE_NOTJUNK | \
 	 CAMEL_MESSAGE_SEEN)
 
 G_BEGIN_DECLS
diff --git a/camel/providers/imapx/camel-imapx-utils.c b/camel/providers/imapx/camel-imapx-utils.c
index b7cbb26..e6e9480 100644
--- a/camel/providers/imapx/camel-imapx-utils.c
+++ b/camel/providers/imapx/camel-imapx-utils.c
@@ -68,6 +68,8 @@ static struct {
 	{ "\\FLAGGED", CAMEL_MESSAGE_FLAGGED },
 	{ "\\SEEN", CAMEL_MESSAGE_SEEN },
 	{ "\\RECENT", CAMEL_IMAPX_MESSAGE_RECENT },
+	{ "JUNK", CAMEL_MESSAGE_JUNK },
+	{ "NOTJUNK", CAMEL_MESSAGE_NOTJUNK },
 	{ "\\*", CAMEL_MESSAGE_USER }
 };