* elmo-imap4.el (elmo-imap4-disuse-server-flag-mailbox-regexp): Revival.

(elmo-imap4-session): Removed use-flag slot.
(elmo-imap4-session-select-mailbox): Undo last change.
(elmo-folder-use-flag-p): Use elmo-imap4-disuse-server-flag-mailbox-regexp.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 88f871c..3eea7a6 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-10  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo-imap4.el (elmo-imap4-disuse-server-flag-mailbox-regexp): 
+       Revival.
+       (elmo-imap4-session): Removed use-flag slot.
+       (elmo-imap4-session-select-mailbox): Undo last change.
+       (elmo-folder-use-flag-p): Use
+       elmo-imap4-disuse-server-flag-mailbox-regexp.
+
 2003-11-09  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-imap4.el (elmo-imap4-session): Added use-flag slot.

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 7ef3911..df99c67 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -51,6 +51,9 @@
 ;;; Code:
 (eval-when-compile (require 'cl))
 
+(defvar elmo-imap4-disuse-server-flag-mailbox-regexp "^#mh" ; UW imapd
+  "Regexp to match IMAP4 mailbox names whose message flags on server should be ignored (For STATUS command).")
+
 (defvar elmo-imap4-overview-fetch-chop-length 200
   "*Number of overviews to fetch in one request.")
 
@@ -177,7 +180,7 @@ Debug information is inserted in the buffer \"*IMAP4 DEBUG*\"")
 ;;; Session
 (eval-and-compile
   (luna-define-class elmo-imap4-session (elmo-network-session)
-                    (capability current-mailbox read-only flags use-flag))
+                    (capability current-mailbox read-only flags))
   (luna-define-internal-accessors 'elmo-imap4-session))
 
 ;;; MIME-ELMO-IMAP Location
@@ -693,11 +696,7 @@ Returns response value if selecting folder succeed. "
              (elmo-imap4-session-set-flags-internal
               session
               (nth 1 (or (assq 'permanentflags response)
-                         (assq 'flags response))))
-             (elmo-imap4-session-set-use-flag-internal
-              session
-              (and (elmo-imap4-session-flag-available-p session 'read)
-                   (elmo-imap4-session-flag-available-p session 'important))))
+                         (assq 'flags response)))))
          (elmo-imap4-session-set-current-mailbox-internal session nil)
          (if (and (eq no-error 'notify-bye)
                   (elmo-imap4-response-bye-p response))
@@ -1914,7 +1913,8 @@ Return nil if no complete line has arrived."
   (elmo-imap4-folder-list-flagged folder 'answered))
 
 (luna-define-method elmo-folder-use-flag-p ((folder elmo-imap4-folder))
-  (elmo-imap4-session-use-flag-internal (elmo-imap4-get-session folder)))
+  (not (string-match elmo-imap4-disuse-server-flag-mailbox-regexp
+                    (elmo-imap4-folder-mailbox-internal folder))))
 
 (luna-define-method elmo-folder-list-subfolders ((folder elmo-imap4-folder)
                                                 &optional one-level)