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

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index cb59583..0d9c9d7 100644
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -161,16 +161,26 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
     (delete-process (elmo-network-session-process-internal session))))
 
 (defun elmo-pop3-get-session (folder &optional if-exists)
+  "Get POP3 session for FOLDER.
+If IF-EXISTS is non-nil, don't get new session.
+If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
   (let ((elmo-pop3-use-uidl-internal (if elmo-inhibit-number-mapping
 					 nil
 				       (elmo-pop3-folder-use-uidl-internal
 					folder))))
-    (elmo-network-get-session 'elmo-pop3-session
-			      (concat
-			       (if (elmo-folder-biff-internal folder)
-				   "BIFF-")
-			       "POP3")
-			      folder if-exists)))
+    (if (eq if-exists 'any-exists)
+	(or (elmo-network-get-session 'elmo-pop3-session
+				      "POP3"
+				      folder if-exists)
+	    (elmo-network-get-session 'elmo-pop3-session
+				      "BIFF-POP3"
+				      folder if-exists))
+      (elmo-network-get-session 'elmo-pop3-session
+				(concat
+				 (if (elmo-folder-biff-internal folder)
+				     "BIFF-")
+				 "POP3")
+				folder if-exists))))
 
 (defun elmo-pop3-send-command (process command &optional no-erase no-log)
   (with-current-buffer (process-buffer process)
@@ -223,19 +233,20 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
       return-value)))
 
 (defun elmo-pop3-process-filter (process output)
-  (with-current-buffer (process-buffer process)
-    (goto-char (point-max))
-    (insert output)
-    (elmo-pop3-debug "RECEIVED: %s\n" output)
-    (if (and elmo-pop3-total-size
-	     (> elmo-pop3-total-size
-		(min elmo-display-retrieval-progress-threshold 100)))
-	(elmo-display-progress
-	 'elmo-display-retrieval-progress
-	 (format "Retrieving (%d/%d bytes)..."
-		 (buffer-size)
-		 elmo-pop3-total-size)
-	 (/ (buffer-size) (/ elmo-pop3-total-size 100))))))
+  (when (buffer-live-p (process-buffer process))
+    (with-current-buffer (process-buffer process)
+      (goto-char (point-max))
+      (insert output)
+      (elmo-pop3-debug "RECEIVED: %s\n" output)
+      (if (and elmo-pop3-total-size
+	       (> elmo-pop3-total-size
+		  (min elmo-display-retrieval-progress-threshold 100)))
+	  (elmo-display-progress
+	   'elmo-display-retrieval-progress
+	   (format "Retrieving (%d/%d bytes)..."
+		   (buffer-size)
+		   elmo-pop3-total-size)
+	   (/ (buffer-size) (/ elmo-pop3-total-size 100)))))))
 
 (defun elmo-pop3-auth-user (session)
   (let ((process (elmo-network-session-process-internal session)))
@@ -666,7 +677,7 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
       (copy-to-buffer tobuffer (point-min) (point-max)))))
 
 (luna-define-method elmo-folder-msgdb-create ((folder elmo-pop3-folder)
-					      numlist seen-list)
+					      numlist flag-table)
   (let ((process (elmo-network-session-process-internal
 		  (elmo-pop3-get-session folder))))
     (with-current-buffer (process-buffer process)
@@ -675,7 +686,7 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
        (elmo-pop3-msgdb-create-by-header
 	process
 	numlist
-	seen-list
+	flag-table
 	(if (elmo-pop3-folder-use-uidl-internal folder)
 	    (elmo-pop3-folder-location-alist-internal folder)))))))
 
@@ -713,7 +724,7 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
 		     elmo-pop3-size-hash))
 
 (defun elmo-pop3-msgdb-create-by-header (process numlist
-						 seen-list
+						 flag-table
 						 loc-alist)
   (let ((tmp-buffer (get-buffer-create " *ELMO Overview TMP*")))
     (with-current-buffer (process-buffer process)
@@ -733,14 +744,14 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
 	   process
 	   (length numlist)
 	   numlist
-	   seen-list loc-alist)
+	   flag-table loc-alist)
 	(kill-buffer tmp-buffer)))))
 
 (defun elmo-pop3-msgdb-create-message (buffer
 				       process
 				       num
 				       numlist
-				       seen-list
+				       flag-table
 				       loc-alist)
   (save-excursion
     (let (beg overview number-alist mark-alist
@@ -784,17 +795,12 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
 		     (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
-					elmo-msgdb-unread-cached-mark)
-				    (if seen
-					(if elmo-pop3-use-cache
-					    elmo-msgdb-read-uncached-mark)
-				      elmo-msgdb-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
@@ -873,7 +879,7 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
 	  (elmo-display-progress
 	   'elmo-display-retrieval-progress
 	   "Retrieving..." 100)  ; remove progress bar.
-	  (message "Retrieving...done."))
+	  (message "Retrieving...done"))
 	(set-buffer outbuf)
 	(goto-char (point-min))
 	(while (re-search-forward "^\\." nil t)