2002-01-27 Takaaki MORIYAMA <aka@iris.eonet.ne.jp>

	* elmo-imap4.el (elmo-folder-list-subfolders): Don't omit user
	name if authentication type is specified.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 33bf2cb..4c8a47e 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-27  Takaaki MORIYAMA  <aka@iris.eonet.ne.jp>
+
+       * elmo-imap4.el (elmo-folder-list-subfolders): Don't omit user
+       name if authentication type is specified.
+
 2002-01-28  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo.el (elmo-default-imap4-stream-type): Define as obsolete

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index d7c129e..0b0e282 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1903,8 +1903,10 @@ Return nil if no complete line has arrived."
                  (elmo-imap4-send-command-wait
                   session
                   (list "list " (elmo-imap4-mailbox root) " *"))))
-    (unless (string= (elmo-net-folder-user-internal folder)
-                    elmo-imap4-default-user)
+    (unless (and (string= (elmo-net-folder-user-internal folder)
+                         elmo-imap4-default-user)
+                (eq (elmo-net-folder-auth-internal folder)
+                    (or elmo-imap4-default-authenticate-type 'clear)))
       (setq append-serv (concat ":" (elmo-net-folder-user-internal folder))))
     (unless (eq (elmo-net-folder-auth-internal folder)
                (or elmo-imap4-default-authenticate-type 'clear))