From: dmaus <dmaus>
Date: Fri, 2 Jul 2010 19:00:32 +0000 (+0000)
Subject: 2010-07-02  David Maus  <dmaus@ictsoc.de>
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=84884cc587300fd6ba511a308972cdc05d401bcc;p=elisp%2Fwanderlust.git

2010-07-02  David Maus  <dmaus@ictsoc.de>

	* elmo-imap4.el (elmo-imap4-folder-status-plugged): Remove usage of kill file to
	adjust message counter.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index d66d637..268561f 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -6,6 +6,8 @@
 	STATUS if it is selected.  If
 	`elmo-imap4-use-select-to-update-status' is non-nil, do the
 	opposite.
+	(elmo-imap4-folder-status-plugged): Remove usage of kill file to
+	adjust message counter.
 
 2010-05-18  David Maus  <dmaus@ictsoc.de>
 
diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 2167656..34098aa 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1983,8 +1983,6 @@ Return nil if no complete line has arrived."
 
 (defun elmo-imap4-folder-status-plugged (folder)
   (let* ((session (elmo-imap4-get-session folder))
-	 (killed (elmo-msgdb-killed-list-load
-		 (elmo-folder-msgdb-path folder)))
 	 (selected (elmo-imap4-mailbox-selected-p
 		    (elmo-imap4-folder-mailbox-internal folder) session))
 	 status)
@@ -2012,11 +2010,7 @@ Return nil if no complete line has arrived."
 		  'status))
     (cons
      (- (elmo-imap4-response-value status 'uidnext) 1)
-     (if killed
-	 (-
-	  (elmo-imap4-response-value status 'messages)
-	  (elmo-msgdb-killed-list-length killed))
-       (elmo-imap4-response-value status 'messages)))))
+     (elmo-imap4-response-value status 'messages))))
 
 (defun elmo-imap4-folder-list-range (folder min max)
   (elmo-imap4-list