X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-filter.el;h=05d8b5afdfff0f75bd9f2b173c6550123744ea56;hb=47b752addd6948e942ff3c3548e86b9c3c2b95d1;hp=b73c5a3b1355394ee7ff568fdd808c43f507dc85;hpb=6444631eeac4bef1933e27202080f62ac536aada;p=elisp%2Fwanderlust.git diff --git a/elmo/elmo-filter.el b/elmo/elmo-filter.el index b73c5a3..05d8b5a 100644 --- a/elmo/elmo-filter.el +++ b/elmo/elmo-filter.el @@ -50,7 +50,7 @@ (if (string-match "^ */\\(.*\\)$" (cdr pair)) (elmo-filter-folder-set-target-internal folder - (elmo-make-folder (elmo-match-string 1 (cdr pair)))) + (elmo-get-folder (elmo-match-string 1 (cdr pair)))) (error "Folder syntax error `%s'" (elmo-folder-name-internal folder))) (elmo-filter-folder-set-require-msgdb-internal folder @@ -80,11 +80,13 @@ (when filterd (elmo-emit-signal 'flag-changed folder filterd))))) (elmo-connect-signal - target 'cache-changed folder - (elmo-define-signal-handler (folder target number) - (elmo-emit-signal 'cache-changed folder number)) - (elmo-define-signal-filter (folder target number) - (memq number (elmo-folder-list-messages folder nil t)))) + target 'status-changed folder + (elmo-define-signal-handler (folder target numbers) + (let ((filterd (elmo-list-filter + (elmo-folder-list-messages folder nil t) + numbers))) + (when filterd + (elmo-emit-signal 'status-changed folder filterd))))) (elmo-connect-signal target 'update-overview folder (elmo-define-signal-handler (folder target number) @@ -155,11 +157,11 @@ (luna-define-method elmo-folder-close-internal ((folder elmo-filter-folder)) (elmo-folder-close-internal (elmo-filter-folder-target-internal folder))) -(luna-define-method elmo-folder-close :after ((folder elmo-filter-folder)) +(luna-define-method elmo-folder-close ((folder elmo-filter-folder)) + (elmo-generic-folder-close folder) (elmo-filter-folder-set-number-list-internal folder nil) (elmo-filter-folder-set-flag-count-internal folder nil) - (elmo-folder-set-msgdb-internal - (elmo-filter-folder-target-internal folder) nil)) + (elmo-folder-close (elmo-filter-folder-target-internal folder))) (luna-define-method elmo-folder-commit ((folder elmo-filter-folder)) (elmo-folder-commit (elmo-filter-folder-target-internal folder)) @@ -431,9 +433,9 @@ (elmo-message-folder (elmo-filter-folder-target-internal folder) number)) (luna-define-method elmo-message-field ((folder elmo-filter-folder) - number field) + number field &optional type) (elmo-message-field - (elmo-filter-folder-target-internal folder) number field)) + (elmo-filter-folder-target-internal folder) number field type)) (luna-define-method elmo-message-set-field ((folder elmo-filter-folder) number field value)