From fcbb915de96956988202568758752da0c2dbdc55 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Wed, 17 May 2000 13:33:04 +0000 Subject: [PATCH] Fix two bugs associated with expunging of messages. This now seems to work right. --- v7/src/imail/imail-imap.scm | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/v7/src/imail/imail-imap.scm b/v7/src/imail/imail-imap.scm index 67b59bab5..3168f98b6 100644 --- a/v7/src/imail/imail-imap.scm +++ b/v7/src/imail/imail-imap.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: imail-imap.scm,v 1.47 2000/05/16 22:07:38 cph Exp $ +;;; $Id: imail-imap.scm,v 1.48 2000/05/17 13:33:04 cph Exp $ ;;; ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology ;;; @@ -409,12 +409,19 @@ (vector-grow v new-length #f)))) (set-imap-folder-n-messages! folder count) (fill-messages-vector! folder n) + (set-imap-folder-messages-synchronized?! folder #t) (folder-modified! folder) n) ((< count n) (error "EXISTS response decreased folder length:" folder)) - (else #f))))))) + (else + (if (not (imap-folder-messages-synchronized? folder)) + (begin + (set-imap-folder-messages-synchronized?! + folder #t) + (folder-modified! folder))) + #f))))))) (if n (read-message-headers! folder n))) (let ((v.n @@ -456,7 +463,10 @@ (attach-message! m folder i*) (vector-set! v* i* m) (loop (fix:+ i 1) (fix:+ i* 1))) - (loop (fix:+ i 1) i*)))))) + (begin + (if (> (imap-message-uid m) (imap-message-uid m*)) + (error "Message inserted into folder:" m*)) + (loop (fix:+ i 1) i*))))))) (folder-modified! folder)))))) ;;;; Message datatype @@ -941,8 +951,9 @@ #f) ((imap:response:expunge? response) (let ((folder (imap-connection-folder connection))) - (remove-imap-folder-message folder - (imap:response:expunge-index response)) + (remove-imap-folder-message + folder + (- (imap:response:expunge-index response) 1)) (folder-modified! folder)) #f) ((imap:response:flags? response) -- 2.25.1