From: okada <okada>
Date: Sun, 18 Aug 2002 08:49:41 +0000 (+0000)
Subject: * elmo-imap4.el (elmo-network-initialize-session):
X-Git-Tag: elmo-mark-root~34
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=539186207d6fd19a5c20c1ef97128ffa3dc6cbbf;p=elisp%2Fwanderlust.git

* elmo-imap4.el (elmo-network-initialize-session):
  Check capability after starttls.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 3306012..8c775dd 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-18  Kenichi OKADA  <okada@opaopa.org>
+
+	* elmo-imap4.el (elmo-network-initialize-session):
+	Check capability after starttls.
+
 2002-08-06  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* elmo-util.el (elmo-list-delete): Added optional argument
diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index c980327..edd2702 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -928,7 +928,12 @@ If CHOP-LENGTH is not specified, message set is not chopped."
 	    (signal 'elmo-open-error
 		    '(elmo-imap4-starttls-error)))
 	(elmo-imap4-send-command-wait session "starttls")
-	(starttls-negotiate process)))))
+	(starttls-negotiate process)
+	(elmo-imap4-session-set-capability-internal
+	 session
+	 (elmo-imap4-response-value
+	  (elmo-imap4-send-command-wait session "capability")
+	  'capability))))))
 
 (luna-define-method elmo-network-authenticate-session ((session
 							elmo-imap4-session))