From: teranisi <teranisi>
Date: Wed, 23 Aug 2000 01:40:23 +0000 (+0000)
Subject: * wl-summary.el (wl-summary-msgdb-load-async): Rewrite.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=92e25d219252d0a19405c4d68272f68eac44fe98;p=elisp%2Fwanderlust.git

* wl-summary.el (wl-summary-msgdb-load-async): Rewrite.

* wl-draft.el (wl-draft-send-mail-with-pop-before-smtp):
Use `elmo-pop3-get-session' instead of `elmo-pop3-get-connection'.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index d60ea83..3ab76e4 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-23  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-summary.el (wl-summary-msgdb-load-async): Rewrite.
+
+	* wl-draft.el (wl-draft-send-mail-with-pop-before-smtp):
+	Use `elmo-pop3-get-session' instead of `elmo-pop3-get-connection'.
+
 2000-08-22   Daiki Ueno  <ueno@unixuser.org>
 
 	* wl-folder.el (wl-folder-create-subr): New function.
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index dc5900a..959f1fd 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -957,7 +957,7 @@ non-nil."
   "Send the prepared message buffer with POP-before-SMTP."
   (require 'elmo-pop3)
   (condition-case ()
-      (elmo-pop3-get-connection 
+      (elmo-pop3-get-session
        (list 'pop3
 	     (or wl-pop-before-smtp-user
 		 elmo-default-pop3-user)
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 07e0aad..afe979f 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -703,28 +703,25 @@ Returns nil if selecting folder was in failure."
   (if (and (elmo-folder-plugged-p folder)
 	   (eq (elmo-folder-get-type folder) 'imap4))
       (let* ((spec (elmo-folder-get-spec folder))
-	     (connection (elmo-imap4-get-connection spec))
-	     (process (elmo-imap4-connection-get-process connection))
+	     (session (elmo-imap4-get-session spec))
+	     (process (elmo-network-session-process-internal session))
+	     (mailbox (elmo-imap4-spec-mailbox spec))
 	     msgdb response)
-	(save-excursion
-	  (unwind-protect
-	      (progn
-		(elmo-imap4-send-command (process-buffer process)
-					 process
-					 (list "select "
-					       (elmo-imap4-mailbox
-						(elmo-imap4-spec-mailbox spec))
-					       ))
-		(setq msgdb (elmo-msgdb-load (elmo-string folder)))
-		(setq response (elmo-imap4-read-response 
-				(process-buffer process)
-				process)))
-	    (if (null response)
-		(progn
-		  (setcar (cddr connection) nil)
-		  (error "Select folder failed"))
-	      (setcar (cddr connection) (elmo-imap4-spec-mailbox spec))))
-	  (if response msgdb)))
+	(unwind-protect
+	    (progn
+	      (elmo-imap4-send-command process
+				       (list "select "
+					     (elmo-imap4-mailbox
+					      mailbox)))
+	      (setq msgdb (elmo-msgdb-load (elmo-string folder)))
+	      (setq response (elmo-imap4-read-response 
+			      process)))
+	  (if response
+	      (elmo-imap4-session-set-current-mailbox-internal
+	       session mailbox)
+	    (elmo-imap4-session-set-current-mailbox-internal session nil)
+	    (error "Select mailbox %s failed" mailbox)))
+	msgdb)
     (elmo-msgdb-load (elmo-string folder))))
 
 (defun wl-summary-buffer-set-folder (folder)