(elmo-shimbun-get-headers): Fixed last change.

(elmo-folder-close-internal): Clean up last-check slot.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index feabe69..7b80b5c 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -4,6 +4,7 @@
        (elmo-shimbun-msgdb-to-headers): Added `expire-days' argument.
        (elmo-shimbun-get-headers): Use return value of
        `shimbun-article-expiration-days'.
+       (elmo-folder-close-internal): Clean up last-check slot.
 
        * elmo-pop3.el (elmo-pop3-process-filter): Show retrieve progress.
        (elmo-pop3-total-size): New variable.

diff --git a/elmo/elmo-shimbun.el b/elmo/elmo-shimbun.el
index 23b3243..5061dd7 100644 (file)
--- a/elmo/elmo-shimbun.el
+++ b/elmo/elmo-shimbun.el
@@ -85,11 +85,13 @@
   (let (headers)
     (dolist (ov (elmo-msgdb-get-overview (elmo-folder-msgdb folder)))
       (when (and (elmo-msgdb-overview-entity-get-extra-field ov "xref")
-                (> (elmo-shimbun-lapse-seconds
-                    (elmo-shimbun-parse-time-string
-                     (elmo-msgdb-overview-entity-get-date ov)))
-                   (* expire-days 86400 ; seconds per day
-                      )))
+                (if expire-days
+                    (> (elmo-shimbun-lapse-seconds
+                        (elmo-shimbun-parse-time-string
+                         (elmo-msgdb-overview-entity-get-date ov)))
+                       (* expire-days 86400 ; seconds per day
+                          ))
+                  t))
        (setq headers
              (cons (shimbun-make-header
                     (elmo-msgdb-overview-entity-get-number ov)
@@ -178,6 +180,8 @@
   (elmo-shimbun-folder-set-headers-internal
    folder nil)
   (elmo-shimbun-folder-set-header-hash-internal
+   folder nil)
+  (elmo-shimbun-folder-set-last-check-internal
    folder nil))
 
 (luna-define-method elmo-folder-plugged-p ((folder elmo-shimbun-folder))