dovecot-1.1: Fixed handling expunges.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/139f2f03b81b
changeset: 7248:139f2f03b81b
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Feb 16 13:21:35 2008 +0200
description:
Fixed handling expunges.

diffstat:

1 file changed, 7 insertions(+), 1 deletion(-)
src/plugins/fts-squat/squat-trie.c |    8 +++++++-

diffs (20 lines):

diff -r 17c65dfdac2a -r 139f2f03b81b src/plugins/fts-squat/squat-trie.c
--- 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 @@ squat_uidlist_update_expunged_uids(const
 				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;
 		}