Mercurial > dovecot > core-2.2
changeset 15754:f6a8f0522634
dsync: Minor fix to deciding when to use GUIDs vs. header hashes.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Mon, 11 Feb 2013 01:22:51 +0200 |
parents | f58e7b386c6e |
children | b9b8286fd9fd |
files | src/doveadm/dsync/dsync-mailbox-import.c |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/dsync/dsync-mailbox-import.c Mon Feb 11 01:10:57 2013 +0200 +++ b/src/doveadm/dsync/dsync-mailbox-import.c Mon Feb 11 01:22:51 2013 +0200 @@ -365,14 +365,14 @@ memset(&m1, 0, sizeof(m1)); if (importer->cur_mail != NULL) { - m1.guid = importer->cur_guid != NULL ? + m1.guid = importer->mails_have_guids ? importer->cur_guid : importer->cur_hdr_hash; m1.uid = importer->cur_mail->uid; } memset(&m2, 0, sizeof(m2)); if (save_change != NULL) { - m2.guid = save_change->hdr_hash != NULL ? - save_change->hdr_hash : save_change->guid; + m2.guid = importer->mails_have_guids ? + save_change->guid : save_change->hdr_hash; m2.uid = save_change->uid; i_assert(save_change->type != DSYNC_MAIL_CHANGE_TYPE_EXPUNGE); }