* elmo-imap4.el (elmo-folder-list-subfolders): Fixed logic.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 53a7ee9..1848593 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-19  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo-imap4.el (elmo-folder-list-subfolders): Fixed logic.
+
 2002-02-18   Daiki Ueno  <ueno@unixuser.org>
 
        * elmo-nntp.el (elmo-nntp-send-mode-reader): Don't throw an error.

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 0b0e282..795d27f 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1903,10 +1903,10 @@ Return nil if no complete line has arrived."
                  (elmo-imap4-send-command-wait
                   session
                   (list "list " (elmo-imap4-mailbox root) " *"))))
-    (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)))
+    (when (or (not (string= (elmo-net-folder-user-internal folder)
+                           elmo-imap4-default-user))
+             (not (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))