2000-12-12 KOGURO Naoki <koguro@dd.iij4u.or.jp>

	* wl-draft.el (wl-draft-send-mail-with-pop-before-smtp): Close POP
	connection before call `wl-draft-send-mail-with-smtp'.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index cbb2ded..bc9e926 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-12  KOGURO Naoki  <koguro@dd.iij4u.or.jp>
+
+       * wl-draft.el (wl-draft-send-mail-with-pop-before-smtp): Close POP
+       connection before call `wl-draft-send-mail-with-smtp'.
+
 2000-11-30  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-version.el (wl-version): Changed codename to "Rio".

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index c3402dc..a4ad255 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1010,18 +1010,19 @@ non-nil."
   "Send the prepared message buffer with POP-before-SMTP."
   (require 'elmo-pop3)
   (condition-case ()
-      (elmo-pop3-get-session
-       (list 'pop3
-            (or wl-pop-before-smtp-user
-                elmo-default-pop3-user)
-            (or wl-pop-before-smtp-authenticate-type
-                elmo-default-pop3-authenticate-type)
-            (or wl-pop-before-smtp-server
-                elmo-default-pop3-server)
-            (or wl-pop-before-smtp-port
-                elmo-default-pop3-port)
-            (or wl-pop-before-smtp-stream-type
-                elmo-default-pop3-stream-type)))
+      (let ((session (elmo-pop3-get-session
+                     (list 'pop3
+                           (or wl-pop-before-smtp-user
+                               elmo-default-pop3-user)
+                           (or wl-pop-before-smtp-authenticate-type
+                               elmo-default-pop3-authenticate-type)
+                           (or wl-pop-before-smtp-server
+                               elmo-default-pop3-server)
+                           (or wl-pop-before-smtp-port
+                               elmo-default-pop3-port)
+                           (or wl-pop-before-smtp-stream-type
+                               elmo-default-pop3-stream-type)))))
+       (and session (elmo-network-close-session session)))
     (error))
   (wl-draft-send-mail-with-smtp))