Mercurial > dovecot > core-2.2
changeset 15743:9a9d408336ea
dsync: Removed unused DSYNC_MAILBOX_IMPORT_FLAG_MAILS_HAVE_GUIDS flag.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sun, 10 Feb 2013 23:09:55 +0200 |
| parents | 28db20f9c0cf |
| children | b4e2b3b54f0a |
| files | src/doveadm/dsync/dsync-brain-mailbox.c src/doveadm/dsync/dsync-mailbox-import.c src/doveadm/dsync/dsync-mailbox-import.h |
| diffstat | 3 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/dsync/dsync-brain-mailbox.c Sun Feb 10 23:05:46 2013 +0200 +++ b/src/doveadm/dsync/dsync-brain-mailbox.c Sun Feb 10 23:09:55 2013 +0200 @@ -205,8 +205,6 @@ import_flags |= DSYNC_MAILBOX_IMPORT_FLAG_WANT_MAIL_REQUESTS; if (brain->master_brain) import_flags |= DSYNC_MAILBOX_IMPORT_FLAG_MASTER_BRAIN; - if (brain->mails_have_guids) - import_flags |= DSYNC_MAILBOX_IMPORT_FLAG_MAILS_HAVE_GUIDS; if (brain->backup_recv) import_flags |= DSYNC_MAILBOX_IMPORT_FLAG_REVERT_LOCAL_CHANGES; if (brain->debug)
--- a/src/doveadm/dsync/dsync-mailbox-import.c Sun Feb 10 23:05:46 2013 +0200 +++ b/src/doveadm/dsync/dsync-mailbox-import.c Sun Feb 10 23:09:55 2013 +0200 @@ -84,7 +84,6 @@ unsigned int local_expunged_guids_set:1; unsigned int new_uids_assigned:1; unsigned int want_mail_requests:1; - unsigned int mails_have_guids:1; unsigned int master_brain:1; unsigned int revert_local_changes:1; }; @@ -164,8 +163,6 @@ i_array_init(&importer->mail_requests, 128); importer->want_mail_requests = TRUE; } - importer->mails_have_guids = - (flags & DSYNC_MAILBOX_IMPORT_FLAG_MAILS_HAVE_GUIDS) != 0; importer->master_brain = (flags & DSYNC_MAILBOX_IMPORT_FLAG_MASTER_BRAIN) != 0; importer->revert_local_changes =
--- a/src/doveadm/dsync/dsync-mailbox-import.h Sun Feb 10 23:05:46 2013 +0200 +++ b/src/doveadm/dsync/dsync-mailbox-import.h Sun Feb 10 23:09:55 2013 +0200 @@ -4,9 +4,8 @@ enum dsync_mailbox_import_flags { DSYNC_MAILBOX_IMPORT_FLAG_MASTER_BRAIN = 0x01, DSYNC_MAILBOX_IMPORT_FLAG_WANT_MAIL_REQUESTS = 0x02, - DSYNC_MAILBOX_IMPORT_FLAG_MAILS_HAVE_GUIDS = 0x04, - DSYNC_MAILBOX_IMPORT_FLAG_REVERT_LOCAL_CHANGES = 0x08, - DSYNC_MAILBOX_IMPORT_FLAG_DEBUG = 0x10 + DSYNC_MAILBOX_IMPORT_FLAG_REVERT_LOCAL_CHANGES = 0x04, + DSYNC_MAILBOX_IMPORT_FLAG_DEBUG = 0x08 }; struct mailbox;