[mew-dist 21518] Re: 嗚呼 IMAP

[Tatsuya Kinoshita]

In message [mew-dist 21516], on August 22, 2002,
Kazu Yamamoto <kazu at example.com> wrote:

> IMAP jobs queue の名称ですが、+imapq は止めて、%queue に変更しました。
> (知らない内に ~/Mail/imapq ができていたら、rm -rf して下さい。)
> 
> これで、「case ごとの jobs queue はどうするんだ問題」は解決です。

mew-imap-queue-folderの修正漏れを見つけたのと、ついでに
mew-imap-inbox-folderもcase対応にしました。

-- 
木下達也
-------------- next part --------------
 This patch is written by Tatsuya Kinoshita.  Copyright is disclaimed.

diff -ur mew.orig/info/mew.texi mew/info/mew.texi
--- mew.orig/info/mew.texi	2002-08-19 22:12:59.000000000 +0900
+++ mew/info/mew.texi	2002-08-22 23:16:08.000000000 +0900
@@ -9172,7 +9172,7 @@
 "cc", "fcc", "dcc", "reply-to", "organization", "header-alist", 
 "mailbox-type", "mbox-command", "mbox-command-arg",
 "inbox-folder", "queue-folder", "postq-folder", 
-"signature-file","content-type", 
+"signature-file", "content-type", 
 "smtp-server", "smtp-port", "smtp-ssh-server", 
 "smtp-ssl", "smtp-ssl-port", 
 "smtp-user", "smtp-auth-list", 
@@ -9186,6 +9186,7 @@
 "imap-ssl", "imap-ssl-port", 
 "imap-user", "imap-auth", "imap-auth-list", 
 "imap-size", "imap-delete", "imap-header-only", 
+"imap-inbox-folder", "imap-queue-folder", 
 "nntp-server", "nntp-port", "nntp-ssh-server", 
 "nntp-ssl", "nntp-ssl-port", 
 "nntp-user", "nntp-size", "nntp-header-only", 
diff -ur mew.orig/mew-config.el mew/mew-config.el
--- mew.orig/mew-config.el	2002-08-22 23:10:27.000000000 +0900
+++ mew/mew-config.el	2002-08-22 23:14:03.000000000 +0900
@@ -302,8 +302,11 @@
 (defun mew-postq-folder (&optional case)
   (mew-cfent-value case "postq-folder" mew-postq-folder))
 
+(defun mew-imap-inbox-folder (&optional case)
+  (mew-cfent-value case "imap-inbox-folder" mew-imap-inbox-folder))
+
 (defun mew-imap-queue-folder (&optional case)
-  (mew-cfent-value case "imapq-folder" mew-imap-queue-folder))
+  (mew-cfent-value case "imap-queue-folder" mew-imap-queue-folder))
 
 (defun mew-header-alist (&optional case)
   (mew-cfent-value case "header-alist" mew-header-alist))
diff -ur mew.orig/mew-imap.el mew/mew-imap.el
--- mew.orig/mew-imap.el	2002-08-22 23:10:27.000000000 +0900
+++ mew/mew-imap.el	2002-08-22 23:20:55.000000000 +0900
@@ -499,6 +499,7 @@
 
 (defun mew-imap-command-post-list (pro pnm)
   (let* ((case (mew-imap-get-case pnm))
+	 (imap-inbox (mew-imap-inbox-folder case))
 	 (friendp (concat "^" (regexp-quote (mew-imap-friend-folder case))))
 	 mbx mailbox mailboxes regex sep subnm friends)
     ;; line delimiters
@@ -509,7 +510,7 @@
 	  (setq sep (mew-match-string 1))
 	  (unless (string= sep "NIL")
 	    (setq regex (concat "\\([^" sep "]+\\)$"))
-	    (setq mailboxes (cons (list mew-imap-inbox-folder sep) mailboxes))))
+	    (setq mailboxes (cons (list imap-inbox sep) mailboxes))))
 	(setq mbx (mew-match-string 2))
 	(let ((case-fold-search nil))
 	  (if (string-match "^INBOX" mbx)
@@ -517,9 +518,9 @@
 	(setq mailbox (concat mew-folder-imap mbx))
 	(cond
 	 ((null regex)
-	  (unless (string= mailbox mew-imap-inbox-folder)
+	  (unless (string= mailbox imap-inbox)
 	    (setq mailboxes (cons (list mailbox mbx) mailboxes))))
-	 ((string= mailbox mew-imap-inbox-folder)
+	 ((string= mailbox imap-inbox)
 	  ())
 	 ((string-match friendp mailbox)
 	  (setq friends (cons mailbox friends))
@@ -530,7 +531,7 @@
       (forward-line))
     (unless case (setq case mew-case-default))
     (setq mailboxes (nreverse mailboxes))
-    (setq mailboxes (cons (list mew-imap-queue-folder nil) mailboxes))
+    (setq mailboxes (cons (list (mew-imap-queue-folder case) nil) mailboxes))
     (mew-imap-folder-set case mailboxes friends)
     (mew-imap-set-status pnm "logout")
     (mew-imap-command-logout pro pnm)))
@@ -1008,8 +1009,8 @@
       (if alist
 	  alist
 	(list
-	 (list mew-imap-inbox-folder nil)
-	 (list mew-imap-queue-folder nil))))))
+	 (list (mew-imap-inbox-folder case) nil)
+	 (list (mew-imap-queue-folder case) nil))))))
 
 (defun mew-imap-friend-folder-list (&optional case no-load)
   (unless case (setq case mew-case-default))
@@ -1074,7 +1075,7 @@
       t)))
 
 (defun mew-imap-separator (case)
-  (or (nth 1 (assoc mew-imap-inbox-folder (mew-imap-folder-alist case)))
+  (or (nth 1 (assoc (mew-imap-inbox-folder case) (mew-imap-folder-alist case)))
       mew-path-separator)) ;; xxx
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff -ur mew.orig/mew-vars2.el mew/mew-vars2.el
--- mew.orig/mew-vars2.el	2002-08-21 21:46:42.000000000 +0900
+++ mew/mew-vars2.el	2002-08-22 23:13:20.000000000 +0900
@@ -891,7 +891,7 @@
   (or proto (setq proto (mew-proto case)))
   (cond
    ((mew-folder-popp  proto) mew-pop-inbox-folder)
-   ((mew-folder-imapp proto) mew-imap-inbox-folder)
+   ((mew-folder-imapp proto) (mew-imap-inbox-folder case))
    ((mew-folder-nntpp proto) (mew-nntp-newsgroup case))
    (t ;; local 
     (mew-inbox-folder case))))