* elmo.el (elmo-folder-list-unreads): Don't use msgdb API.

[elisp/wanderlust.git] / elmo / elmo.el

diff --git a/elmo/elmo.el b/elmo/elmo.el
index bcda883..a4e4793 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -268,13 +268,13 @@ If optional IN-MSGDB is non-nil, retrieve flag information from msgdb.")
   (elmo-msgdb-list-flagged (elmo-folder-msgdb folder) flag))
 
 (luna-define-method elmo-folder-list-unreads ((folder elmo-folder))
-  (elmo-msgdb-list-flagged (elmo-folder-msgdb folder) 'unread))
+  (elmo-folder-list-flagged folder 'unread))
 
 (luna-define-method elmo-folder-list-importants ((folder elmo-folder))
-  (elmo-msgdb-list-flagged (elmo-folder-msgdb folder) 'important))
+  (elmo-folder-list-flagged folder 'important))
 
 (luna-define-method elmo-folder-list-answereds ((folder elmo-folder))
-  (elmo-msgdb-list-flagged (elmo-folder-msgdb folder) 'answered))
+  (elmo-folder-list-flagged folder 'answered))
 
 (luna-define-generic elmo-folder-list-messages-internal (folder &optional
                                                                visible-only)
@@ -1094,8 +1094,7 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-MARK-ALIST).")
       (if (and (not no-delete) succeeds)
          (progn
            (if (and (elmo-folder-delete-messages src-folder succeeds)
-                    (elmo-msgdb-delete-msgs
-                     (elmo-folder-msgdb src-folder) succeeds))
+                    (elmo-folder-detach-messages src-folder succeeds))
                (setq result t)
              (message "move: delete messages from %s failed."
                       (elmo-folder-name-internal src-folder))
@@ -1507,8 +1506,8 @@ If update process is interrupted, return nil.")
                (elmo-folder-process-crosspost folder)
                0 ; no updates.
                )
-           (if delete-list (elmo-msgdb-delete-msgs
-                            (elmo-folder-msgdb folder) delete-list))
+           (when delete-list
+             (elmo-folder-detach-messages folder delete-list))
            (when new-list
              (elmo-msgdb-change-mark (elmo-folder-msgdb folder)
                                      elmo-msgdb-new-mark