* elmo-imap4.el (elmo-network-initialize-session): Change error message.

	* elmo-pop3.el (elmo-network-initialize-session): Change error message.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index d0d9d49..bea286f 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-28  Kenichi OKADA  <okada@opaopa.org>
+
+       * elmo-imap4.el (elmo-network-initialize-session): Change error message.
+       * elmo-pop3.el (elmo-network-initialize-session): Change error message.
+
 2000-10-27  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-imap4.el (elmo-imap4-session-select-mailbox): Return response

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index c90ead4..182a026 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1209,12 +1209,13 @@ If optional argument UNMARK is non-nil, unmark."
        (elmo-imap4-response-value
        (elmo-imap4-send-command-wait session "capability")
        'capability))
+      (debug)
       (when (eq (elmo-network-stream-type-symbol
                 (elmo-network-session-stream-type-internal session))
                'starttls)
        (or (memq 'starttls capability)
            (signal 'elmo-open-error
-                   '(elmo-network-initialize-session)))
+                   '(elmo-imap4-starttls-error)))
        (elmo-imap4-send-command-wait session "starttls")
        (starttls-negotiate process)))))
 

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 1a82f44..892361a 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -320,7 +320,7 @@
                          (elmo-pop3-read-response process))
            (starttls-negotiate process)
          (signal 'elmo-open-error
-                 '(elmo-network-intialize-session)))))))
+                 '(elmo-pop3-starttls-error)))))))
 
 (luna-define-method elmo-network-authenticate-session ((session
                                                        elmo-pop3-session))