X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-filter.el;h=923ae8c2a74e98427d9594efbbee951771f39ee8;hb=c2738fdc4e616fb55973a7e285432f60af6c1c57;hp=1293f4b0035115fa65f8638e7d32691bad97db14;hpb=d9e2a1d256315bb9d148e2d1996f0c8c693d1d84;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-filter.el b/elmo/elmo-filter.el
index 1293f4b..923ae8c 100644
--- a/elmo/elmo-filter.el
+++ b/elmo/elmo-filter.el
@@ -129,7 +129,7 @@
 			     len "Creating msgdb..."))
 	(unwind-protect
 	    (dolist (number numlist)
-	      (setq entity (elmo-msgdb-overview-get-entity number msgdb))
+	      (setq entity (elmo-msgdb-message-entity msgdb number))
 	      (when entity
 		(elmo-msgdb-append-entity new-msgdb entity
 					  (elmo-msgdb-flags msgdb number)))
@@ -278,53 +278,57 @@
   (elmo-message-file-name (elmo-filter-folder-target-internal folder)
 			  number))
 
-(luna-define-method elmo-folder-mark-as-read :around ((folder
+(luna-define-method elmo-folder-flag-as-read :around ((folder
 						       elmo-filter-folder)
 						      numbers
-						      &optional ignore-flag)
-  (elmo-folder-mark-as-read (elmo-filter-folder-target-internal folder)
-			    numbers ignore-flag)
+						      &optional is-local)
+  (elmo-folder-flag-as-read (elmo-filter-folder-target-internal folder)
+			    numbers is-local)
   (luna-call-next-method))
 
-(luna-define-method elmo-folder-unmark-read :around ((folder
+(luna-define-method elmo-folder-unflag-read :around ((folder
 						      elmo-filter-folder)
 						     numbers
-						     &optional ignore-flag)
-  (elmo-folder-unmark-read (elmo-filter-folder-target-internal folder)
-			   numbers ignore-flag)
+						     &optional is-local)
+  (elmo-folder-unflag-read (elmo-filter-folder-target-internal folder)
+			   numbers is-local)
   (luna-call-next-method))
 
-(luna-define-method elmo-folder-mark-as-important :around ((folder
+(luna-define-method elmo-folder-flag-as-important :around ((folder
 							    elmo-filter-folder)
 							   numbers
 							   &optional
-							   ignore-flag)
-  (elmo-folder-mark-as-important (elmo-filter-folder-target-internal folder)
-				 numbers ignore-flag)
+							   is-local)
+  (elmo-folder-flag-as-important (elmo-filter-folder-target-internal folder)
+				 numbers is-local)
     (luna-call-next-method))
 
-(luna-define-method elmo-folder-unmark-important :around ((folder
+(luna-define-method elmo-folder-unflag-important :around ((folder
 							   elmo-filter-folder)
 							  numbers
 							  &optional
-							  ignore-flag)
-  (elmo-folder-unmark-important (elmo-filter-folder-target-internal folder)
-				numbers ignore-flag)
+							  is-local)
+  (elmo-folder-unflag-important (elmo-filter-folder-target-internal folder)
+				numbers is-local)
   (luna-call-next-method))
 
-(luna-define-method elmo-folder-mark-as-answered :around ((folder
+(luna-define-method elmo-folder-flag-as-answered :around ((folder
 							   elmo-filter-folder)
-							  numbers)
-  (elmo-folder-mark-as-answered (elmo-filter-folder-target-internal folder)
-				numbers)
+							  numbers
+							  &optional
+							  is-local)
+  (elmo-folder-flag-as-answered (elmo-filter-folder-target-internal folder)
+				numbers is-local)
   (luna-call-next-method))
 
 
-(luna-define-method elmo-folder-unmark-answered :around ((folder
+(luna-define-method elmo-folder-unflag-answered :around ((folder
 							  elmo-filter-folder)
-							 numbers)
-  (elmo-folder-unmark-answered (elmo-filter-folder-target-internal folder)
-			       numbers)
+							 numbers
+							 &optional
+							 is-local)
+  (elmo-folder-unflag-answered (elmo-filter-folder-target-internal folder)
+			       numbers is-local)
   (luna-call-next-method))
 
 (require 'product)