[evolution-data-server/gnome-2-30] Store Junk and NotJunk flags in IMAP server

[David Woodhouse <dwmw2 src gnome org>]

commit 45db57fde9a4cee6366b4d5986e0b1128210e18e
Author: David Woodhouse <David Woodhouse intel com>
Date:   Sat Jul 31 16:20:45 2010 +0200

    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...
    (cherry picked from commit bed388e3a851596e1163fed8ee57cb41c81b9b10)

 camel/providers/imapx/camel-imapx-server.c  |    4 +++-
 camel/providers/imapx/camel-imapx-summary.h |    2 ++
 camel/providers/imapx/camel-imapx-utils.c   |    2 ++
 3 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index f8cd95f..ff1a67f 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -4105,7 +4105,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 7ea05a7..0d641ee 100644
--- a/camel/providers/imapx/camel-imapx-summary.h
+++ b/camel/providers/imapx/camel-imapx-summary.h
@@ -35,6 +35,8 @@
 				 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 274736d..6c86d0b 100644
--- a/camel/providers/imapx/camel-imapx-utils.c
+++ b/camel/providers/imapx/camel-imapx-utils.c
@@ -75,6 +75,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 }
 };