imapc: Merged gmail-pop3 and gmail-labels-keyword features into a single gmail-migrat...

There's really no other reason to use them except for migration.

diff --git a/src/lib-storage/index/imapc/imapc-mail.c b/src/lib-storage/index/imapc/imapc-mail.c
index 0f31678da7c5b5697d76e1a0509e7b1407641b9b..bbc1884b4da9fad6fa13e977e0a87ea894299b76 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-mail.c
+++ b/src/lib-storage/index/imapc/imapc-mail.c
@@ -476,7 +476,7 @@ imapc_mail_get_special(struct mail *_mail, enum mail_fetch_field field,
                *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 --git a/src/lib-storage/index/imapc/imapc-mailbox.c b/src/lib-storage/index/imapc/imapc-mailbox.c
index 65ff90c592a8c3453157fd48ac7a5ec483837559..c4bccf54c38f15bce8996e4a1720588d1fae9f8e 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-mailbox.c
+++ b/src/lib-storage/index/imapc/imapc-mailbox.c
@@ -295,7 +295,7 @@ static void imapc_untagged_fetch(const struct imapc_untagged_reply *reply,
                                }
                        }
                } 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 --git a/src/lib-storage/index/imapc/imapc-settings.c b/src/lib-storage/index/imapc/imapc-settings.c
index 2a58725e30aab3462c332ceecc6866ebd4ff1b24..88c5c3bbdde1d0a7f4a501b3b7f0ee3a080f6fe0 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-settings.c
+++ b/src/lib-storage/index/imapc/imapc-settings.c
@@ -84,8 +84,7 @@ static const struct imapc_feature_list imapc_feature_list[] = {
        { "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 --git a/src/lib-storage/index/imapc/imapc-settings.h b/src/lib-storage/index/imapc/imapc-settings.h
index 6715514f83061fed815d033bef2ef52feb967250..441ab53598a50c3f98282e2ed784a028738aacc6 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-settings.h
+++ b/src/lib-storage/index/imapc/imapc-settings.h
@@ -6,8 +6,7 @@ enum imapc_features {
        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 --git a/src/lib-storage/index/imapc/imapc-sync.c b/src/lib-storage/index/imapc/imapc-sync.c
index eeadc871c923f114973c515c2d9b3e82d2150492..5ca0a4ece270ed2f406fde812dc7691b7595ced5 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-sync.c
+++ b/src/lib-storage/index/imapc/imapc-sync.c
@@ -281,7 +281,7 @@ imapc_sync_send_commands(struct imapc_sync_context *ctx, uint32_t first_uid)
        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 @@ imapc_sync_send_commands(struct imapc_sync_context *ctx, uint32_t first_uid)
        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;