From 68f7cb815bd4b17b5d1e5cd405c6abb1a2065d10 Mon Sep 17 00:00:00 2001
From: yoichi <yoichi>
Date: Thu, 12 Sep 2002 15:53:07 +0000
Subject: [PATCH] * wl/wl-folder.el (wl-folder-flush-queue): Call
 elmo-dop-queue-flush without argument. * elmo-dop.el
 (elmo-dop-queue-flush): Remove unused argument. Remove
 redundunt connectivity check.

---
 elmo/ChangeLog   |    5 +++++
 elmo/elmo-dop.el |   10 +++-------
 wl/ChangeLog     |    3 +++
 wl/wl-folder.el  |    2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 25c4119..2c82aff 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-12  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* elmo-dop.el (elmo-dop-queue-flush): Remove unused argument.
+	Remove redundunt connectivity check.
+
 2002-09-08  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
 	* elmo-dop.el (elmo-dop-queue-flush): Perform plugged ones only so
diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index 8a53a0c..e08592a 100644
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -82,10 +82,8 @@ Automatically loaded/saved.")
   `(cdr (assq (elmo-dop-queue-method ,queue)
 	      elmo-dop-queue-method-name-alist)))
 
-(defun elmo-dop-queue-flush (&optional force)
-  "Flush disconnected operations.
-If optional argument FORCE is non-nil, try flushing all operation queues
-even an operation concerns the unplugged folder."
+(defun elmo-dop-queue-flush ()
+  "Flush disconnected operations that consern plugged folders."
   (elmo-dop-queue-merge)
   (let ((queue-all elmo-dop-queue)
 	queue
@@ -130,9 +128,7 @@ even an operation concerns the unplugged folder."
 				 (setq folder
 				       (elmo-make-folder
 					(elmo-dop-queue-fname (car queue))))
-			       (elmo-folder-open folder)
-			       (unless (elmo-folder-plugged-p folder); redundant?
-				 (error "Unplugged.")))
+			       (elmo-folder-open folder))
 			     (elmo-dop-queue-arguments (car queue)))
 		      (elmo-folder-close folder))
 		  (quit  (setq failure t))
diff --git a/wl/ChangeLog b/wl/ChangeLog
index 3d75292..860a070 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,8 @@
 2002-09-12  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
+	* wl-folder.el (wl-folder-flush-queue): Call elmo-dop-queue-flush
+	without argument.
+
 	* wl-draft.el (wl-draft-config-sub-eval-insert): New function.
 	Evaluate content and if the value is string, insert it.
 	(wl-draft-config-sub-body,wl-draft-config-sub-top,
diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index bc833d0..30b17d6 100644
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -478,7 +478,7 @@ Default HASHTB is `wl-folder-elmo-folder-hashtb'."
 	(wl-plugged t)
 	emptied)
     (if elmo-enable-disconnected-operation
-	(elmo-dop-queue-flush 'force)) ; Try flushing all queue.
+	(elmo-dop-queue-flush))
     (if (not (elmo-folder-list-messages
 	      (wl-folder-get-elmo-folder wl-queue-folder)))
 	(message "No sending queue exists.")
-- 
1.7.10.4