[evolution-data-server/gnome-2-30] Add support for * VANISHED (EARLIER) [uidset...]

[David Woodhouse <dwmw2 src gnome org>]

commit 723d724b21a003f47e18ee9ebb947ed182031ccd
Author: David Woodhouse <David Woodhouse intel com>
Date:   Wed Jun 30 09:39:22 2010 +0100

    Add support for * VANISHED (EARLIER) [uidset...]
    
    (Actually just throw away anything in the parentheses).
    
    We'll need this for QRESYNC SELECT
    (cherry picked from commit de786c4147333489ac1dfb25b378acf96541919c)

 camel/providers/imapx/camel-imapx-server.c |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 44e5598..7097889 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -1238,9 +1238,26 @@ imapx_untagged(CamelIMAPXServer *imap, CamelException *ex)
 		break;
 	}
 	case IMAPX_VANISHED: {
-		GPtrArray *uids = imapx_parse_uids(imap->stream, ex);
+		GPtrArray *uids;
 		int i;
+		guint len;
+		guchar *token;
+		gint tok;
+
+		tok = camel_imapx_stream_token (imap->stream, &token, &len, ex);
+		if (camel_exception_is_set(ex))
+			return -1;
+		if (tok == '(') {
+			while (tok != ')') {
+				/* We expect this to be 'EARLIER' */
+				tok = camel_imapx_stream_token(imap->stream, &token, &len, ex);
+				if (camel_exception_is_set(ex))
+					return -1;
+			}
+		} else
+			camel_imapx_stream_ungettoken(imap->stream, tok, token, len);
 
+		uids = imapx_parse_uids(imap->stream, ex);
 		if (camel_exception_is_set(ex))
 			return -1;
 		for (i = 0; i < uids->len; i++) {