X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-pop3.el;h=0d9c9d72ce484c6510396c78dd4ee0875286ea93;hb=fb40159a1fc3d4fb1400f8fe3befb1056bc75b8c;hp=d594e9333f7a4daab2cc3b6ee62a2ac72b8a37cc;hpb=9ddac14c0b5daa5f6226bb422c36d16b2ccac5e9;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index d594e93..0d9c9d7 100644
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -677,9 +677,7 @@ If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
       (copy-to-buffer tobuffer (point-min) (point-max)))))
 
 (luna-define-method elmo-folder-msgdb-create ((folder elmo-pop3-folder)
-					      numlist new-mark
-					      already-mark seen-mark
-					      important-mark seen-list)
+					      numlist flag-table)
   (let ((process (elmo-network-session-process-internal
 		  (elmo-pop3-get-session folder))))
     (with-current-buffer (process-buffer process)
@@ -688,8 +686,7 @@ If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
        (elmo-pop3-msgdb-create-by-header
 	process
 	numlist
-	new-mark already-mark
-	seen-mark seen-list
+	flag-table
 	(if (elmo-pop3-folder-use-uidl-internal folder)
 	    (elmo-pop3-folder-location-alist-internal folder)))))))
 
@@ -727,9 +724,7 @@ If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
 		     elmo-pop3-size-hash))
 
 (defun elmo-pop3-msgdb-create-by-header (process numlist
-						 new-mark already-mark
-						 seen-mark
-						 seen-list
+						 flag-table
 						 loc-alist)
   (let ((tmp-buffer (get-buffer-create " *ELMO Overview TMP*")))
     (with-current-buffer (process-buffer process)
@@ -749,15 +744,14 @@ If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
 	   process
 	   (length numlist)
 	   numlist
-	   new-mark already-mark seen-mark seen-list loc-alist)
+	   flag-table loc-alist)
 	(kill-buffer tmp-buffer)))))
 
 (defun elmo-pop3-msgdb-create-message (buffer
 				       process
 				       num
-				       numlist new-mark already-mark
-				       seen-mark
-				       seen-list
+				       numlist
+				       flag-table
 				       loc-alist)
   (save-excursion
     (let (beg overview number-alist mark-alist
@@ -801,17 +795,12 @@ If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
 		     (elmo-msgdb-overview-entity-get-number entity)
 		     (car entity)))
 	      (setq message-id (car entity))
-	      (setq seen (member message-id seen-list))
 	      (if (setq gmark (or (elmo-msgdb-global-mark-get message-id)
-				  (if (elmo-file-cache-status
-				       (elmo-file-cache-get message-id))
-				      (if seen
-					  nil
-					already-mark)
-				    (if seen
-					(if elmo-pop3-use-cache
-					    seen-mark)
-				      new-mark))))
+				  (elmo-msgdb-mark
+				   (elmo-flag-table-get flag-table message-id)
+				   (elmo-file-cache-status
+				    (elmo-file-cache-get message-id))
+				   'new)))
 		  (setq mark-alist
 			(elmo-msgdb-mark-append
 			 mark-alist