(elmo-imap4-arrival-filter): Use `case' instead of `cond'.

[elisp/wanderlust.git] / elmo / elmo-shimbun.el

diff --git a/elmo/elmo-shimbun.el b/elmo/elmo-shimbun.el
index da51154..68da028 100644 (file)
--- a/elmo/elmo-shimbun.el
+++ b/elmo/elmo-shimbun.el
@@ -230,14 +230,14 @@ If it is the symbol `all', update overview for all shimbun folders."
      (elmo-shimbun-folder-shimbun-internal folder)
      (elmo-shimbun-folder-group-internal folder))
     (let ((inhibit-quit t))
-      (unless (elmo-map-folder-location-alist-internal folder)
-       (elmo-map-folder-location-setup
+      (unless (elmo-location-map-alist folder)
+       (elmo-location-map-setup
         folder
         (elmo-msgdb-location-load (elmo-folder-msgdb-path folder))))
       (when (and (elmo-folder-plugged-p folder)
                 (elmo-shimbun-headers-check-p folder))
        (elmo-shimbun-get-headers folder)
-       (elmo-map-folder-update-locations
+       (elmo-location-map-update
         folder
         (elmo-map-folder-list-message-locations folder))))))
 
@@ -473,15 +473,10 @@ If it is the symbol `all', update overview for all shimbun folders."
               (setq folders
                     (append folders
                             (mapcar
-                             (lambda (fld) (concat prefix server "." fld))
+                             (lambda (group) (concat prefix server "." group))
                              (shimbun-groups
-                              (shimbun-open server
-                                            (let ((fld
-                                                   (elmo-make-folder
-                                                    (concat prefix server))))
-                                              (luna-make-entity
-                                               'shimbun-elmo-mua
-                                               :folder fld))))))))
+                              (elmo-shimbun-folder-shimbun-internal
+                               (elmo-get-folder (concat prefix server))))))))
             folders)))))
 
 (luna-define-method elmo-folder-exists-p ((folder elmo-shimbun-folder))