* WL-ELS (ELMO-MODULES): Added elmo-signal.

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

diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index 9409c88..1a499e3 100644 (file)
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -30,6 +30,7 @@
 ;;
 
 (require 'elmo)
+(require 'elmo-signal)
 
 (defvar elmo-pipe-folder-copied-filename "copied"
   "Copied messages number set.")
@@ -52,8 +53,23 @@
     (elmo-pipe-folder-set-copy-internal folder
                                        (string= ":"
                                                 (elmo-match-string 2 name))))
+  (elmo-pipe-connect-signals folder (elmo-pipe-folder-dst-internal folder))
   folder)
 
+(defun elmo-pipe-connect-signals (folder destination)
+  (elmo-connect-signal
+   destination 'flag-changing folder
+   (elmo-define-signal-handler (folder dst number old-flags new-flags)
+     (elmo-emit-signal 'flag-changing folder number old-flags new-flags)))
+  (elmo-connect-signal
+   destination 'flag-changed folder
+   (elmo-define-signal-handler (folder dst numbers)
+     (elmo-emit-signal 'flag-changed folder numbers)))
+  (elmo-connect-signal
+   destination 'cache-changed folder
+   (elmo-define-signal-handler (folder dst number)
+     (elmo-emit-signal 'cache-changed folder number))))
+
 (luna-define-method elmo-folder-get-primitive-list ((folder elmo-pipe-folder))
   (nconc
    (elmo-folder-get-primitive-list (elmo-pipe-folder-src-internal folder))
@@ -78,9 +94,9 @@
 
 (luna-define-method elmo-message-fetch ((folder elmo-pipe-folder)
                                        number strategy
-                                       &optional section outbuf unseen)
+                                       &optional unseen section)
   (elmo-message-fetch (elmo-pipe-folder-dst-internal folder)
-                     number strategy section outbuf unseen))
+                     number strategy unseen section))
 
 (luna-define-method elmo-folder-clear :after ((folder elmo-pipe-folder)
                                              &optional keep-killed)
@@ -92,6 +108,11 @@
   (elmo-folder-delete-messages (elmo-pipe-folder-dst-internal folder)
                               numbers))
 
+(luna-define-method elmo-folder-detach-messages ((folder elmo-pipe-folder)
+                                                numbers)
+  (elmo-folder-detach-messages (elmo-pipe-folder-dst-internal folder)
+                              numbers))
+
 (defvar elmo-pipe-drained-hook nil "A hook called when the pipe is flushed.")
 
 (defsubst elmo-pipe-folder-list-target-messages (src &optional ignore-list)
@@ -176,8 +197,8 @@
         ((consp (cdr dst-diff)) ; new unread all
          (mapcar (lambda (number) (+ number src-length)) dst-diff))
         (t
-         (cons (+ (car dst-diff) src-length)
-               (+ (cdr dst-diff) src-length))))
+         (cons (+ (or (car dst-diff) 0) src-length)
+               (+ (or (cdr dst-diff) 0) src-length))))
       ;; No save.
       (elmo-folder-close-internal (elmo-pipe-folder-src-internal folder))
       (elmo-folder-close-internal (elmo-pipe-folder-dst-internal folder)))))
@@ -302,7 +323,8 @@
                                             &optional
                                             disable-killed
                                             ignore-msgdb
-                                            no-check)
+                                            no-check
+                                            mask)
   (let ((src-folder (elmo-pipe-folder-src-internal folder))
        (dst-folder (elmo-pipe-folder-dst-internal folder)))
     (when (and (elmo-folder-plugged-p src-folder)
@@ -317,7 +339,7 @@
        (elmo-pipe-drain src-folder dst-folder))))
   (elmo-folder-synchronize
    (elmo-pipe-folder-dst-internal folder)
-   disable-killed ignore-msgdb no-check))
+   disable-killed ignore-msgdb no-check mask))
 
 (luna-define-method elmo-folder-list-flagged ((folder elmo-pipe-folder)
                                              flag
@@ -331,6 +353,12 @@
 (luna-define-method elmo-folder-length ((folder elmo-pipe-folder))
   (elmo-folder-length (elmo-pipe-folder-dst-internal folder)))
 
+(luna-define-method elmo-message-flag-available-p ((folder elmo-pipe-folder)
+                                                  number flag)
+  (elmo-message-flag-available-p
+   (elmo-pipe-folder-dst-internal folder)
+   number flag))
+
 (luna-define-method elmo-folder-count-flags ((folder elmo-pipe-folder))
   (elmo-folder-count-flags (elmo-pipe-folder-dst-internal folder)))
 
@@ -348,21 +376,28 @@
   (elmo-message-set-cached (elmo-pipe-folder-dst-internal folder)
                           number cached))
 
-(luna-define-method elmo-find-fetch-strategy
-  ((folder elmo-pipe-folder) entity &optional ignore-cache)
+(luna-define-method elmo-find-fetch-strategy ((folder elmo-pipe-folder)
+                                             number
+                                             &optional
+                                             ignore-cache
+                                             require-entireness)
   (elmo-find-fetch-strategy (elmo-pipe-folder-dst-internal folder)
-                           (elmo-message-entity
-                            (elmo-pipe-folder-dst-internal folder)
-                            (elmo-message-entity-number entity))
-                           ignore-cache))
+                           number
+                           ignore-cache
+                           require-entireness))
+
+(luna-define-method elmo-message-number ((folder elmo-pipe-folder)
+                                        message-id)
+  (elmo-message-number (elmo-pipe-folder-dst-internal folder)
+                      message-id))
 
 (luna-define-method elmo-message-entity ((folder elmo-pipe-folder) key)
   (elmo-message-entity (elmo-pipe-folder-dst-internal folder) key))
 
 (luna-define-method elmo-message-folder ((folder elmo-pipe-folder)
                                         number)
-  (elmo-pipe-folder-dst-internal folder))
-                                            
+  (elmo-message-folder (elmo-pipe-folder-dst-internal folder) number))
+
 (require 'product)
 (product-provide (provide 'elmo-pipe) (require 'elmo-version))