* check-modules.el (test-shimbun): Check `shimbun-server'.

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

diff --git a/elmo/elmo-shimbun.el b/elmo/elmo-shimbun.el
index b7d989f..3f3b792 100644 (file)
--- a/elmo/elmo-shimbun.el
+++ b/elmo/elmo-shimbun.el
@@ -33,6 +33,9 @@
 (require 'elmo-dop)
 (require 'shimbun)
 
+(eval-when-compile
+  (defun-maybe shimbun-servers-list ()))
+
 (defcustom elmo-shimbun-check-interval 60
   "*Check interval for shimbun."
   :type 'integer
@@ -190,8 +193,8 @@ update overview when message is fetched."
 
 (defun elmo-shimbun-get-headers (folder)
   (let* ((shimbun (elmo-shimbun-folder-shimbun-internal folder))
-        (key (concat (shimbun-server-internal shimbun)
-                     "." (shimbun-current-group-internal shimbun)))
+        (key (concat (shimbun-server shimbun)
+                     "." (shimbun-current-group shimbun)))
         (elmo-hash-minimum-size 63)
         headers)
     ;; new headers.
@@ -281,30 +284,30 @@ update overview when message is fetched."
   (elmo-plugged-p
    "shimbun"
    (and (elmo-shimbun-folder-shimbun-internal folder)
-       (shimbun-server-internal (elmo-shimbun-folder-shimbun-internal folder)))
+       (shimbun-server (elmo-shimbun-folder-shimbun-internal folder)))
    nil nil
    (and (elmo-shimbun-folder-shimbun-internal folder)
-       (shimbun-server-internal (elmo-shimbun-folder-shimbun-internal folder)))))
+       (shimbun-server (elmo-shimbun-folder-shimbun-internal folder)))))
 
 (luna-define-method elmo-folder-set-plugged ((folder elmo-shimbun-folder)
                                             plugged &optional add)
   (elmo-set-plugged plugged
                    "shimbun"
-                   (shimbun-server-internal
+                   (shimbun-server
                     (elmo-shimbun-folder-shimbun-internal folder))
                    nil nil nil
-                   (shimbun-server-internal
+                   (shimbun-server
                     (elmo-shimbun-folder-shimbun-internal folder))
                    add))
 
 (luna-define-method elmo-net-port-info ((folder elmo-shimbun-folder))
   (list "shimbun"
-       (shimbun-server-internal
+       (shimbun-server
         (elmo-shimbun-folder-shimbun-internal folder))
        nil))
 
 (luna-define-method elmo-folder-check :around ((folder elmo-shimbun-folder))
-  (when (shimbun-current-group-internal
+  (when (shimbun-current-group
         (elmo-shimbun-folder-shimbun-internal folder))
     (when (and (elmo-folder-plugged-p folder)
               (elmo-shimbun-headers-check-p folder))
@@ -322,7 +325,7 @@ update overview when message is fetched."
 (luna-define-method elmo-folder-expand-msgdb-path ((folder
                                                    elmo-shimbun-folder))
   (expand-file-name
-   (concat (shimbun-server-internal
+   (concat (shimbun-server
            (elmo-shimbun-folder-shimbun-internal folder))
           "/"
           (elmo-shimbun-folder-group-internal folder))
@@ -346,10 +349,7 @@ update overview when message is fetched."
          (list (cons "xref" (shimbun-header-xref header)))))))))
 
 (luna-define-method elmo-folder-msgdb-create ((folder elmo-shimbun-folder)
-                                             numlist new-mark
-                                             already-mark seen-mark
-                                             important-mark
-                                             seen-list)
+                                             numlist flag-table)
   (let* (overview number-alist mark-alist entity
                  i percent number length pair msgid gmark seen)
     (setq length (length numlist))
@@ -368,15 +368,12 @@ update overview when message is fetched."
        (setq number-alist
              (elmo-msgdb-number-add number-alist
                                     number msgid))
-       (setq seen (member msgid seen-list))
        (if (setq gmark (or (elmo-msgdb-global-mark-get msgid)
-                           (if (elmo-file-cache-status
-                                (elmo-file-cache-get msgid))
-                               (if seen nil already-mark)
-                             (if seen
-                                 (if elmo-shimbun-use-cache
-                                     seen-mark)
-                               new-mark))))
+                           (elmo-msgdb-mark
+                            (elmo-flag-table-get flag-table msgid)
+                            (elmo-file-cache-status
+                             (elmo-file-cache-get msgid))
+                            'new)))
            (setq mark-alist
                  (elmo-msgdb-mark-append mark-alist
                                          number gmark))))
@@ -501,7 +498,7 @@ update overview when message is fetched."
             (mapcar
              (lambda (fld)
                (concat prefix
-                       (shimbun-server-internal
+                       (shimbun-server
                         (elmo-shimbun-folder-shimbun-internal folder))
                        "." fld))
              (shimbun-groups (elmo-shimbun-folder-shimbun-internal folder)))))
@@ -536,27 +533,6 @@ update overview when message is fetched."
                          folder))))
     t))
 
-;;; To override elmo-map-folder methods.
-(luna-define-method elmo-folder-list-unreads-internal
-  ((folder elmo-shimbun-folder) unread-marks &optional mark-alist)
-  t)
-
-(luna-define-method elmo-folder-unmark-important ((folder elmo-shimbun-folder)
-                                                 numbers)
-  t)
-
-(luna-define-method elmo-folder-mark-as-important ((folder elmo-shimbun-folder)
-                                                  numbers)
-  t)
-
-(luna-define-method elmo-folder-unmark-read ((folder elmo-shimbun-folder)
-                                            numbers)
-  t)
-
-(luna-define-method elmo-folder-mark-as-read ((folder elmo-shimbun-folder)
-                                             numbers)
-  t)
-
 (require 'product)
 (product-provide (provide 'elmo-shimbun) (require 'elmo-version))