* elmo-filter.el (elmo-folder-msgdb-create): Use

`elmo-message-entity' and `elmo-message-flags' instead of
`elmo-msgdb-message-entity' and `elmo-msgdb-flags'.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index f797f4f..2b38ff9 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-04  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-filter.el (elmo-folder-msgdb-create): Use
+       `elmo-message-entity' and `elmo-message-flags' instead of
+       `elmo-msgdb-message-entity' and `elmo-msgdb-flags'.
+
 2003-11-27  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-spam.el (elmo-spam-processor): Added 3rd argument

diff --git a/elmo/elmo-filter.el b/elmo/elmo-filter.el
index 2e0e7ec..b43fd34 100644 (file)
--- a/elmo/elmo-filter.el
+++ b/elmo/elmo-filter.el
@@ -119,20 +119,19 @@
   (if (elmo-filter-folder-require-msgdb-internal folder)
       (let* ((target-folder (elmo-filter-folder-target-internal folder))
             (len (length numlist))
-            (msgdb (progn
-                     (elmo-folder-check target-folder)
-                     (elmo-folder-msgdb target-folder)))
             (new-msgdb (elmo-make-msgdb))
             message-id entity)
+       (elmo-folder-check target-folder)
        (when (> len elmo-display-progress-threshold)
          (elmo-progress-set 'elmo-folder-msgdb-create
                             len "Creating msgdb..."))
        (unwind-protect
            (dolist (number numlist)
-             (setq entity (elmo-msgdb-message-entity msgdb number))
+             (setq entity (elmo-message-entity target-folder number))
              (when entity
-               (elmo-msgdb-append-entity new-msgdb entity
-                                         (elmo-msgdb-flags msgdb number)))
+               (elmo-msgdb-append-entity
+                new-msgdb entity
+                (elmo-message-flags target-folder number)))
              (elmo-progress-notify 'elmo-folder-msgdb-create))
          (elmo-progress-clear 'elmo-folder-msgdb-create))
        new-msgdb)