dovecot-2.2: dsync: Minor fix to deciding when to use GUIDs vs. ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/f6a8f0522634
changeset: 15754:f6a8f0522634
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Feb 11 01:22:51 2013 +0200
description:
dsync: Minor fix to deciding when to use GUIDs vs. header hashes.

diffstat:

 src/doveadm/dsync/dsync-mailbox-import.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r f58e7b386c6e -r f6a8f0522634 src/doveadm/dsync/dsync-mailbox-import.c
--- 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);
 	}