dovecot-2.2: imapc: Merged gmail-pop3 and gmail-labels-keyword f...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/111dcc2ca272
changeset: 18199:111dcc2ca272
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Jan 23 23:19:24 2015 +0200
description:
imapc: Merged gmail-pop3 and gmail-labels-keyword features into a single gmail-migration feature
There's really no other reason to use them except for migration.

diffstat:

 src/lib-storage/index/imapc/imapc-mail.c     |  2 +-
 src/lib-storage/index/imapc/imapc-mailbox.c  |  2 +-
 src/lib-storage/index/imapc/imapc-settings.c |  3 +--
 src/lib-storage/index/imapc/imapc-settings.h |  3 +--
 src/lib-storage/index/imapc/imapc-sync.c     |  4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)

diffs (71 lines):

diff -r f2fac7c857f2 -r 111dcc2ca272 src/lib-storage/index/imapc/imapc-mail.c
--- a/src/lib-storage/index/imapc/imapc-mail.c	Fri Jan 23 23:18:01 2015 +0200
+++ b/src/lib-storage/index/imapc/imapc-mail.c	Fri Jan 23 23:19:24 2015 +0200
@@ -476,7 +476,7 @@
 		*value_r = "";
 		return imapc_mail_get_guid(_mail, value_r);
 	case MAIL_FETCH_UIDL_BACKEND:
-		if (!IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_GMAIL_POP3))
+		if (!IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_GMAIL_MIGRATION))
 			break;
 		if (imapc_mail_get_guid(_mail, value_r) < 0)
 			return -1;
diff -r f2fac7c857f2 -r 111dcc2ca272 src/lib-storage/index/imapc/imapc-mailbox.c
--- a/src/lib-storage/index/imapc/imapc-mailbox.c	Fri Jan 23 23:18:01 2015 +0200
+++ b/src/lib-storage/index/imapc/imapc-mailbox.c	Fri Jan 23 23:19:24 2015 +0200
@@ -295,7 +295,7 @@
 				}
 			}
 		} else if (strcasecmp(atom, "X-GM-LABELS") == 0 &&
-			   IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_GMAIL_LABELS_KEYWORD)) {
+			   IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_GMAIL_MIGRATION)) {
 			if (!imap_arg_get_list(&list[i+1], &flags_list))
 				return;
 			if (flags_list[0].type != IMAP_ARG_EOL)
diff -r f2fac7c857f2 -r 111dcc2ca272 src/lib-storage/index/imapc/imapc-settings.c
--- a/src/lib-storage/index/imapc/imapc-settings.c	Fri Jan 23 23:18:01 2015 +0200
+++ b/src/lib-storage/index/imapc/imapc-settings.c	Fri Jan 23 23:19:24 2015 +0200
@@ -84,8 +84,7 @@
 	{ "rfc822.size", IMAPC_FEATURE_RFC822_SIZE },
 	{ "guid-forced", IMAPC_FEATURE_GUID_FORCED },
 	{ "fetch-headers", IMAPC_FEATURE_FETCH_HEADERS },
-	{ "gmail-labels-keyword", IMAPC_FEATURE_GMAIL_LABELS_KEYWORD },
-	{ "gmail-pop3", IMAPC_FEATURE_GMAIL_POP3 },
+	{ "gmail-migration", IMAPC_FEATURE_GMAIL_MIGRATION },
 	{ NULL, 0 }
 };
 
diff -r f2fac7c857f2 -r 111dcc2ca272 src/lib-storage/index/imapc/imapc-settings.h
--- a/src/lib-storage/index/imapc/imapc-settings.h	Fri Jan 23 23:18:01 2015 +0200
+++ b/src/lib-storage/index/imapc/imapc-settings.h	Fri Jan 23 23:19:24 2015 +0200
@@ -6,8 +6,7 @@
 	IMAPC_FEATURE_RFC822_SIZE		= 0x01,
 	IMAPC_FEATURE_GUID_FORCED		= 0x02,
 	IMAPC_FEATURE_FETCH_HEADERS		= 0x04,
-	IMAPC_FEATURE_GMAIL_LABELS_KEYWORD	= 0x08,
-	IMAPC_FEATURE_GMAIL_POP3		= 0x10
+	IMAPC_FEATURE_GMAIL_MIGRATION		= 0x08
 };
 /* </settings checks> */
 
diff -r f2fac7c857f2 -r 111dcc2ca272 src/lib-storage/index/imapc/imapc-sync.c
--- a/src/lib-storage/index/imapc/imapc-sync.c	Fri Jan 23 23:18:01 2015 +0200
+++ b/src/lib-storage/index/imapc/imapc-sync.c	Fri Jan 23 23:19:24 2015 +0200
@@ -281,7 +281,7 @@
 	string_t *cmd = t_str_new(64);
 
 	str_printfa(cmd, "UID FETCH %u:* (FLAGS", first_uid);
-	if (IMAPC_BOX_HAS_FEATURE(ctx->mbox, IMAPC_FEATURE_GMAIL_LABELS_KEYWORD)) {
+	if (IMAPC_BOX_HAS_FEATURE(ctx->mbox, IMAPC_FEATURE_GMAIL_MIGRATION)) {
 		/* do this only for the \All mailbox */
 		enum mailbox_info_flags flags;
 
@@ -293,7 +293,7 @@
 	str_append_c(cmd, ')');
 	imapc_sync_cmd(ctx, str_c(cmd));
 
-	if (IMAPC_BOX_HAS_FEATURE(ctx->mbox, IMAPC_FEATURE_GMAIL_POP3) &&
+	if (IMAPC_BOX_HAS_FEATURE(ctx->mbox, IMAPC_FEATURE_GMAIL_MIGRATION) &&
 	    ctx->mbox->storage->set->pop3_deleted_flag[0] != '\0') {
 		struct imapc_command *cmd;