* elmo-map.el (elmo-folder-open-internal): Don't load location map if

it is already loaded.

* elmo.el (elmo-folder-open-internal-p)
(elmo-folder-move-messages): Method removed.
* elmo-filter.el (elmo-folder-open-internal-p): Dto.
* elmo-map.el (elmo-folder-open-internal-p): Dto.
* elmo-multi.el (elmo-folder-open-internal-p): Dto.
* elmo-pipe.el (elmo-folder-open-internal-p): Dto.
* elmo-pop3.el (elmo-folder-open-internal-p): Dto.
* elmo-shimbun.el (elmo-folder-open-internal-p): Dto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index b07d013..7e9af8a 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-31  David Maus  <dmaus@ictsoc.de>
+
+       * elmo-map.el (elmo-folder-open-internal): Don't load location map
+       if it is already loaded.
+
+       * elmo.el (elmo-folder-open-internal-p)
+       (elmo-folder-move-messages): Method removed.
+       * elmo-filter.el (elmo-folder-open-internal-p): Dto.
+       * elmo-map.el (elmo-folder-open-internal-p): Dto.
+       * elmo-multi.el (elmo-folder-open-internal-p): Dto.
+       * elmo-pipe.el (elmo-folder-open-internal-p): Dto.
+       * elmo-pop3.el (elmo-folder-open-internal-p): Dto.
+       * elmo-shimbun.el (elmo-folder-open-internal-p): Dto.
+
 2010-10-24  David Maus  <dmaus@ictsoc.de>
 
        * elmo-pop3.el (elmo-folder-open-internal-p): Define method for

diff --git a/elmo/elmo-filter.el b/elmo/elmo-filter.el
index 65aacfa..700be31 100644 (file)
--- a/elmo/elmo-filter.el
+++ b/elmo/elmo-filter.el
@@ -156,9 +156,6 @@
 (luna-define-method elmo-folder-open-internal ((folder elmo-filter-folder))
   (elmo-folder-open-internal (elmo-filter-folder-target-internal folder)))
 
-(luna-define-method elmo-folder-open-internal-p ((folder elmo-filter-folder))
-  (elmo-folder-open-internal-p (elmo-filter-folder-target-internal folder)))
-
 (luna-define-method elmo-folder-check ((folder elmo-filter-folder))
   (when (elmo-filter-folder-require-msgdb-internal folder)
     (elmo-folder-synchronize (elmo-filter-folder-target-internal folder))))

diff --git a/elmo/elmo-map.el b/elmo/elmo-map.el
index 20c6f65..383124a 100644 (file)
--- a/elmo/elmo-map.el
+++ b/elmo/elmo-map.el
@@ -227,15 +227,13 @@ Return new location alist."
     (elmo-folder-set-msgdb-internal folder new-msgdb)))
 
 (luna-define-method elmo-folder-open-internal ((folder elmo-map-folder))
-  (elmo-location-map-load folder (elmo-folder-msgdb-path folder))
+  (unless (elmo-location-map-alist folder)
+    (elmo-location-map-load folder (elmo-folder-msgdb-path folder)))
   (when (elmo-folder-plugged-p folder)
     (elmo-location-map-update
      folder
      (elmo-map-folder-list-message-locations folder))))
 
-(luna-define-method elmo-folder-open-internal-p ((folder elmo-map-folder))
-  (elmo-location-map-alist folder))
-
 (luna-define-method elmo-folder-commit :after ((folder elmo-map-folder))
   (when (elmo-folder-persistent-p folder)
     (elmo-location-map-save folder (elmo-folder-msgdb-path folder))))

diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el
index 4f15a9d..2e52de3 100644 (file)
--- a/elmo/elmo-multi.el
+++ b/elmo/elmo-multi.el
@@ -121,13 +121,7 @@
 
 (luna-define-method elmo-folder-open-internal ((folder elmo-multi-folder))
   (dolist (fld (elmo-multi-folder-children-internal folder))
-    (unless (elmo-folder-open-internal-p fld)
-      (elmo-folder-open-internal fld))))
-
-(luna-define-method elmo-folder-open-internal-p ((folder elmo-multi-folder))
-  (let ((open t))
-    (dolist (fld (elmo-multi-folder-children-internal folder) open)
-      (setq open (and open (elmo-folder-open-internal-p fld))))))
+    (elmo-folder-open-internal fld)))
 
 (luna-define-method elmo-folder-check ((folder elmo-multi-folder))
   (dolist (fld (elmo-multi-folder-children-internal folder))

diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index 68bb479..f3c7ffc 100644 (file)
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -179,9 +179,6 @@
 (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)))
 

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 2801637..aff5d75 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -789,9 +789,6 @@ until the login delay period has expired"))
   (when (elmo-pop3-folder-use-uidl folder)
     (elmo-location-map-load folder (elmo-folder-msgdb-path folder))))
 
-(luna-define-method elmo-folder-open-internal-p ((folder elmo-pop3-folder))
-  (elmo-location-map-alist folder))
-
 (luna-define-method elmo-folder-commit :after ((folder elmo-pop3-folder))
   (when (and (not elmo-inhibit-number-mapping)
             (elmo-folder-persistent-p folder))

diff --git a/elmo/elmo-shimbun.el b/elmo/elmo-shimbun.el
index f788b5f..889280a 100644 (file)
--- a/elmo/elmo-shimbun.el
+++ b/elmo/elmo-shimbun.el
@@ -241,9 +241,6 @@ If it is the symbol `all', update overview for all shimbun folders."
         folder
         (elmo-map-folder-list-message-locations folder))))))
 
-(luna-define-method elmo-folder-open-internal-p ((folder elmo-shimbun-folder))
-  (elmo-location-map-alist folder))
-
 (luna-define-method elmo-folder-reserve-status-p ((folder elmo-shimbun-folder))
   t)
 

diff --git a/elmo/elmo.el b/elmo/elmo.el
index c3c0bd7..3b3e707 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -217,9 +217,6 @@ If optional LOAD-MSGDB is non-nil, msgdb is loaded.
 (luna-define-generic elmo-folder-open-internal (folder)
   "Open FOLDER (without loading saved folder status).")
 
-(luna-define-generic elmo-folder-open-internal-p (folder)
-  "Return non-nil if FOLDER is opened internally.")
-
 (luna-define-generic elmo-folder-check (folder)
   "Check the FOLDER to obtain newest information at the next list operation.")
 
@@ -716,10 +713,6 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-FLAG-ALIST).")
   nil ; default is do nothing.
   )
 
-(luna-define-method elmo-folder-open-internal-p ((folder elmo-folder))
-  t ; default is always opened internally
-  )
-
 (luna-define-method elmo-folder-check ((folder elmo-folder))
   nil) ; default is noop.
 
@@ -1195,8 +1188,7 @@ Returns a list of message numbers successfully appended."
          (error "move: %d is not writable"
                 (elmo-folder-name-internal dst-folder)))
        (when messages
-         (unless (elmo-folder-open-internal-p src-folder)
-           (elmo-folder-open-internal src-folder))
+         (elmo-folder-open-internal src-folder)
          (elmo-folder-open-internal dst-folder)
          (unless (setq succeeds (elmo-folder-append-messages dst-folder
                                                              src-folder