Mercurial > dovecot > original-hg > dovecot-1.2

changeset 7248:139f2f03b81b HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed handling expunges.
author Timo Sirainen <tss@iki.fi>
date Sat, 16 Feb 2008 13:21:35 +0200
parents 17c65dfdac2a
children eb310b0d0966
files src/plugins/fts-squat/squat-trie.c
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/fts-squat/squat-trie.c	Fri Feb 15 14:52:00 2008 +0200
+++ b/src/plugins/fts-squat/squat-trie.c	Sat Feb 16 13:21:35 2008 +0200
@@ -1201,9 +1201,15 @@
 				array_delete(uids_arr, uid_idx, 1);
 				uids = array_get_modifiable(uids_arr,
 							    &uid_count);
-			} else {
+			} else if (do_shifts) {
 				/* the next loop iteration fixes the UIDs */
 				uids[uid_idx].seq1 += child_shift_count;
+			} else {
+				seq_range_array_remove_range(uids_arr,
+							     shift.seq1,
+							     shift.seq2);
+				uids = array_get_modifiable(uids_arr,
+							    &uid_count);
 			}
 			shift_sum += child_shift_count;
 		}