From 162850aa79527e37531d0b09ea0def0abb2fc1d3 Mon Sep 17 00:00:00 2001 From: hmurata Date: Thu, 24 Mar 2005 03:35:19 +0000 Subject: [PATCH] Synch up with main trunk. --- elmo/ChangeLog | 13 +++++++++++++ elmo/elmo-access.el | 1 + elmo/elmo-filter.el | 6 +++--- elmo/elmo-multi.el | 5 +++-- elmo/elmo-pipe.el | 6 +++++- 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 0cf41af..13b316a 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,16 @@ +2005-03-23 Hiroya Murata + + * elmo-access.el (elmo-folder-initialize): Call + `elmo-multi-connect-signals'. + + * elmo-pipe.el (elmo-folder-close): Define. + + * elmo-multi.el (elmo-folder-close): Call `elmo-folder-close' with + children folders. + + * elmo-filter.el (elmo-folder-close): Call `elmo-folder-close' + with target folder. + 2005-03-14 Yoichi NAKAYAMA * elmo-flag.el (elmo-global-flags-initialize): Don't include diff --git a/elmo/elmo-access.el b/elmo/elmo-access.el index 4aa955b..a071254 100644 --- a/elmo/elmo-access.el +++ b/elmo/elmo-access.el @@ -53,6 +53,7 @@ folder elmo-multi-divide-number) (elmo-access-folder-update-children folder) + (elmo-multi-connect-signals folder) folder) (luna-define-method elmo-folder-expand-msgdb-path ((folder elmo-access-folder)) diff --git a/elmo/elmo-filter.el b/elmo/elmo-filter.el index b73c5a3..a0fce2d 100644 --- a/elmo/elmo-filter.el +++ b/elmo/elmo-filter.el @@ -155,11 +155,11 @@ (luna-define-method elmo-folder-close-internal ((folder elmo-filter-folder)) (elmo-folder-close-internal (elmo-filter-folder-target-internal folder))) -(luna-define-method elmo-folder-close :after ((folder elmo-filter-folder)) +(luna-define-method elmo-folder-close ((folder elmo-filter-folder)) + (elmo-generic-folder-close folder) (elmo-filter-folder-set-number-list-internal folder nil) (elmo-filter-folder-set-flag-count-internal folder nil) - (elmo-folder-set-msgdb-internal - (elmo-filter-folder-target-internal folder) nil)) + (elmo-folder-close (elmo-filter-folder-target-internal folder))) (luna-define-method elmo-folder-commit ((folder elmo-filter-folder)) (elmo-folder-commit (elmo-filter-folder-target-internal folder)) diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el index b8926c9..46ea6c6 100644 --- a/elmo/elmo-multi.el +++ b/elmo/elmo-multi.el @@ -132,9 +132,10 @@ (dolist (fld (elmo-multi-folder-children-internal folder)) (elmo-folder-close-internal fld))) -(luna-define-method elmo-folder-close :after ((folder elmo-multi-folder)) +(luna-define-method elmo-folder-close ((folder elmo-multi-folder)) + (elmo-generic-folder-close folder) (dolist (fld (elmo-multi-folder-children-internal folder)) - (elmo-folder-set-msgdb-internal fld nil))) + (elmo-folder-close fld))) (luna-define-method elmo-folder-synchronize ((folder elmo-multi-folder) &optional diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el index 07a12e4..079f8f8 100644 --- a/elmo/elmo-pipe.el +++ b/elmo/elmo-pipe.el @@ -179,7 +179,11 @@ (elmo-folder-open-internal (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))) + (elmo-folder-close-internal (elmo-pipe-folder-dst-internal folder))) + +(luna-define-method elmo-folder-close ((folder elmo-pipe-folder)) + (elmo-generic-folder-close folder) + (elmo-folder-close (elmo-pipe-folder-dst-internal folder))) (luna-define-method elmo-folder-list-messages ((folder elmo-pipe-folder) &optional visible-only in-msgdb) -- 1.7.10.4