X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-pipe.el;h=68bb4796235c9aebc021791f9046a406c95aaca0;hb=2706485848c7fabd109477e1d7fad89a6249f0b2;hp=4194f9c6858f0df94828fe6fbd14c3ba616c0f99;hpb=f62ab39de3b81cadaa6646c0f07561ad5064cb16;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index 4194f9c..68bb479 100644
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -84,11 +84,22 @@
   (or (elmo-folder-contains-type (elmo-pipe-folder-src-internal folder) type)
       (elmo-folder-contains-type (elmo-pipe-folder-dst-internal folder) type)))
 
-(luna-define-method elmo-folder-append-messages ((folder elmo-pipe-folder)
-						 src-folder numbers
-						 &optional same-number)
-  (elmo-folder-append-messages (elmo-pipe-folder-dst-internal folder)
-			       src-folder numbers
+(defun elmo-folder-append-messages-pipe-* (dst-folder
+					   src-folder
+					   numbers
+					   same-number)
+  (elmo-folder-append-messages dst-folder
+			       (elmo-pipe-folder-dst-internal src-folder)
+			       numbers
+			       same-number))
+
+(defun elmo-folder-append-messages-*-pipe (dst-folder
+					   src-folder
+					   numbers
+					   same-number)
+  (elmo-folder-append-messages (elmo-pipe-folder-dst-internal dst-folder)
+			       src-folder
+			       numbers
 			       same-number))
 
 (luna-define-method elmo-folder-append-buffer ((folder elmo-pipe-folder)
@@ -120,37 +131,27 @@
 (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)
-  (unwind-protect
-      (progn
-	(elmo-folder-set-killed-list-internal src ignore-list)
-	(elmo-folder-list-messages src t))
-    (elmo-folder-set-killed-list-internal src nil)))
+  (let ((killed (elmo-folder-killed-list-internal src)))
+    (elmo-folder-set-killed-list-internal src ignore-list)
+    (unwind-protect
+	(elmo-folder-list-messages src t)
+      (elmo-folder-set-killed-list-internal src killed))))
 
 (defun elmo-pipe-drain (src dst &optional copy ignore-list)
   "Move or copy all messages of SRC to DST."
-  (let ((elmo-inhibit-number-mapping (and (eq (elmo-folder-type-internal
-					       src) 'pop3)
-					  (not copy))) ; No need to use UIDL
-	msgs len)
+  (let ((elmo-inhibit-number-mapping (and (eq (elmo-folder-type-internal src)
+					      'pop3)
+					  (not copy)))) ; No need to use UIDL
     (message "Checking %s..." (elmo-folder-name-internal src))
-    ;; Warnnig: some function requires msgdb
-    ;; but elmo-folder-open-internal do not load msgdb.
-    (elmo-folder-open-internal src)
-    (setq msgs (elmo-pipe-folder-list-target-messages src ignore-list)
-	  len (length msgs))
-    (when (> len elmo-display-progress-threshold)
-      (elmo-progress-set 'elmo-folder-move-messages
-			 len
-			 (if copy
-			     "Copying messages..."
-			   "Moving messages...")))
+    (elmo-folder-open src)
     (unwind-protect
-	(elmo-folder-move-messages src msgs dst copy)
-      (elmo-progress-clear 'elmo-folder-move-messages))
-    (when (and copy msgs)
-      (setq ignore-list (elmo-number-set-append-list ignore-list
-						     msgs)))
-    (elmo-folder-close-internal src)
+	(let ((msgs (elmo-pipe-folder-list-target-messages src ignore-list)))
+	  (elmo-with-progress-display (elmo-folder-move-messages (length msgs))
+	      (if copy "Copying messages" "Moving messages")
+	    (elmo-folder-move-messages src msgs dst copy))
+	  (when (and copy msgs)
+	    (setq ignore-list (elmo-number-set-append-list ignore-list msgs))))
+      (elmo-folder-close src))
     (run-hooks 'elmo-pipe-drained-hook)
     ignore-list))
 
@@ -178,6 +179,9 @@
 (luna-define-method elmo-folder-open-internal ((folder elmo-pipe-folder))
   (elmo-folder-open-internal (elmo-pipe-folder-dst-internal folder)))
 
+(luna-define-method elmo-folder-open-internal-p ((folder elmo-pipe-folder))
+  (elmo-folder-open-internal-p (elmo-pipe-folder-dst-internal folder)))
+
 (luna-define-method elmo-folder-close-internal ((folder elmo-pipe-folder))
   (elmo-folder-close-internal (elmo-pipe-folder-dst-internal folder)))
 
@@ -262,6 +266,13 @@
   (and (elmo-folder-plugged-p (elmo-pipe-folder-src-internal folder))
        (elmo-folder-plugged-p (elmo-pipe-folder-dst-internal folder))))
 
+(luna-define-method elmo-folder-set-plugged ((folder elmo-pipe-folder)
+					     plugged &optional add)
+  (elmo-folder-set-plugged (elmo-pipe-folder-src-internal folder)
+			   plugged add)
+  (elmo-folder-set-plugged (elmo-pipe-folder-dst-internal folder)
+			   plugged add))
+
 (luna-define-method elmo-folder-message-file-p ((folder elmo-pipe-folder))
   (elmo-folder-message-file-p (elmo-pipe-folder-dst-internal folder)))