X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-pipe.el;h=d7e90dd398e5a9ffb8bd3e14d854e99016ac9a64;hb=298179ef92e7400bdab05f509725ebfb9672b038;hp=d36314379c3f934b59cfecca832fe59b6aecd86f;hpb=c1e70a9ddc4f3c6a051665cc9d6c0bb27c263bc2;p=elisp%2Fwanderlust.git diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el index d363143..d7e90dd 100644 --- a/elmo/elmo-pipe.el +++ b/elmo/elmo-pipe.el @@ -55,11 +55,9 @@ folder) (luna-define-method elmo-folder-get-primitive-list ((folder elmo-pipe-folder)) - (elmo-flatten - (mapcar - 'elmo-folder-get-primitive-list - (list (elmo-pipe-folder-src-internal folder) - (elmo-pipe-folder-dst-internal folder))))) + (nconc + (elmo-folder-get-primitive-list (elmo-pipe-folder-src-internal folder)) + (elmo-folder-get-primitive-list (elmo-pipe-folder-dst-internal folder)))) (luna-define-method elmo-folder-contains-type ((folder elmo-pipe-folder) type) @@ -100,7 +98,7 @@ (unwind-protect (progn (elmo-folder-set-killed-list-internal src ignore-list) - (elmo-folder-list-messages src)) + (elmo-folder-list-messages src t)) (elmo-folder-set-killed-list-internal src nil))) (defun elmo-pipe-drain (src dst &optional copy ignore-list) @@ -164,15 +162,6 @@ (elmo-folder-list-messages (elmo-pipe-folder-dst-internal folder) visible-only in-msgdb)) -(luna-define-method elmo-folder-list-unreads ((folder elmo-pipe-folder)) - (elmo-folder-list-unreads (elmo-pipe-folder-dst-internal folder))) - -(luna-define-method elmo-folder-list-importants ((folder elmo-pipe-folder)) - (elmo-folder-list-importants (elmo-pipe-folder-dst-internal folder))) - -(luna-define-method elmo-folder-list-answereds ((folder elmo-pipe-folder)) - (elmo-folder-list-answereds (elmo-pipe-folder-dst-internal folder))) - (luna-define-method elmo-folder-diff ((folder elmo-pipe-folder)) (elmo-folder-open-internal (elmo-pipe-folder-src-internal folder)) (elmo-folder-open-internal (elmo-pipe-folder-dst-internal folder)) @@ -187,8 +176,8 @@ ((consp (cdr dst-diff)) ; new unread all (mapcar (lambda (number) (+ number src-length)) dst-diff)) (t - (cons (+ (car dst-diff) src-length) - (+ (cdr dst-diff) src-length)))) + (cons (+ (or (car dst-diff) 0) src-length) + (+ (or (cdr dst-diff) 0) src-length)))) ;; No save. (elmo-folder-close-internal (elmo-pipe-folder-src-internal folder)) (elmo-folder-close-internal (elmo-pipe-folder-dst-internal folder))))) @@ -270,40 +259,21 @@ (elmo-folder-message-make-temp-files (elmo-pipe-folder-dst-internal folder) numbers start-number)) -(luna-define-method elmo-folder-flag-as-read ((folder elmo-pipe-folder) - numbers &optional is-local) - (elmo-folder-flag-as-read (elmo-pipe-folder-dst-internal folder) - numbers is-local)) - -(luna-define-method elmo-folder-unflag-read ((folder elmo-pipe-folder) - numbers - &optional is-local) - (elmo-folder-unflag-read (elmo-pipe-folder-dst-internal folder) - numbers is-local)) - -(luna-define-method elmo-folder-unflag-important ((folder elmo-pipe-folder) - numbers - &optional is-local) - (elmo-folder-unflag-important (elmo-pipe-folder-dst-internal folder) - numbers is-local)) - -(luna-define-method elmo-folder-flag-as-important ((folder elmo-pipe-folder) - numbers - &optional is-local) - (elmo-folder-flag-as-important (elmo-pipe-folder-dst-internal folder) - numbers is-local)) - -(luna-define-method elmo-folder-unflag-answered ((folder elmo-pipe-folder) - numbers - &optional is-local) - (elmo-folder-unflag-answered (elmo-pipe-folder-dst-internal folder) - numbers is-local)) - -(luna-define-method elmo-folder-flag-as-answered ((folder elmo-pipe-folder) - numbers - &optional is-local) - (elmo-folder-flag-as-answered (elmo-pipe-folder-dst-internal folder) - numbers is-local)) +(luna-define-method elmo-folder-set-flag ((folder elmo-pipe-folder) + numbers + flag + &optional is-local) + (elmo-folder-set-flag (elmo-pipe-folder-dst-internal folder) + numbers flag is-local) + (elmo-folder-notify-event folder 'flag-changed numbers)) + +(luna-define-method elmo-folder-unset-flag ((folder elmo-pipe-folder) + numbers + flag + &optional is-local) + (elmo-folder-unset-flag (elmo-pipe-folder-dst-internal folder) + numbers flag is-local) + (elmo-folder-notify-event folder 'flag-changed numbers)) (luna-define-method elmo-folder-pack-numbers ((folder elmo-pipe-folder)) (elmo-folder-pack-numbers (elmo-pipe-folder-dst-internal folder))) @@ -334,7 +304,8 @@ &optional disable-killed ignore-msgdb - no-check) + no-check + mask) (let ((src-folder (elmo-pipe-folder-src-internal folder)) (dst-folder (elmo-pipe-folder-dst-internal folder))) (when (and (elmo-folder-plugged-p src-folder) @@ -349,7 +320,7 @@ (elmo-pipe-drain src-folder dst-folder)))) (elmo-folder-synchronize (elmo-pipe-folder-dst-internal folder) - disable-killed ignore-msgdb no-check)) + disable-killed ignore-msgdb no-check mask)) (luna-define-method elmo-folder-list-flagged ((folder elmo-pipe-folder) flag @@ -363,6 +334,12 @@ (luna-define-method elmo-folder-length ((folder elmo-pipe-folder)) (elmo-folder-length (elmo-pipe-folder-dst-internal folder))) +(luna-define-method elmo-message-flag-available-p ((folder elmo-pipe-folder) + number flag) + (elmo-message-flag-available-p + (elmo-pipe-folder-dst-internal folder) + number flag)) + (luna-define-method elmo-folder-count-flags ((folder elmo-pipe-folder)) (elmo-folder-count-flags (elmo-pipe-folder-dst-internal folder))) @@ -388,13 +365,18 @@ (elmo-message-entity-number entity)) ignore-cache)) +(luna-define-method elmo-message-number ((folder elmo-pipe-folder) + message-id) + (elmo-message-number (elmo-pipe-folder-dst-internal folder) + message-id)) + (luna-define-method elmo-message-entity ((folder elmo-pipe-folder) key) (elmo-message-entity (elmo-pipe-folder-dst-internal folder) key)) (luna-define-method elmo-message-folder ((folder elmo-pipe-folder) number) - (elmo-pipe-folder-dst-internal folder)) - + (elmo-message-folder (elmo-pipe-folder-dst-internal folder) number)) + (require 'product) (product-provide (provide 'elmo-pipe) (require 'elmo-version))