2004-03-15 ARISAWA Akihiro <ari@mbf.sphere.ne.jp>

	* elmo-imap4.el (elmo-folder-list-subfolders): Add root mailbox
	if it is not contained in the response(A workaround for courier-imap).

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index a595174..25ec854 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-15  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+       * elmo-imap4.el (elmo-folder-list-subfolders): Add root mailbox
+       if it is not contained in the response(A workaround for courier-imap).
+
 2004-03-11  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-imap4.el (elmo-folder-set-flag-plugged): Fix mismatched

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index f0029d5..c7a4ff9 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1952,6 +1952,14 @@ Return nil if no complete line has arrived."
                  (elmo-imap4-send-command-wait
                   session
                   (list "list " (elmo-imap4-mailbox root) " *"))))
+    ;; The response of Courier-imap doesn't contain a specified folder itself.
+    (unless (member root result)
+      (setq result
+           (append result
+                   (elmo-imap4-response-get-selectable-mailbox-list
+                    (elmo-imap4-send-command-wait
+                     session
+                     (list "list \"\" " (elmo-imap4-mailbox root)))))))
     (when (or (not (string= (elmo-net-folder-user-internal folder)
                            elmo-imap4-default-user))
              (not (eq (elmo-net-folder-auth-internal folder)
@@ -2584,6 +2592,7 @@ If optional argument REMOVE is non-nil, remove FLAG."
                                  (and (memq 'answered flags)
                                       '("\\Answered")))
                                 " ")
+                               ;; XX KEYWORD flags
                                ") ")
                      " () ")
                    (elmo-imap4-buffer-literal send-buffer))))