From: teranisi <teranisi>
Date: Sat, 7 Jun 2003 04:59:46 +0000 (+0000)
Subject: * elmo-shimbun.el (elmo-shimbun-get-headers): Use shimbun-server instead of
X-Git-Tag: merged-trunk-to-elmo-mark-18~15
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c8cab71314d066402c5e4907eeea4ba81f16753e;p=elisp%2Fwanderlust.git

* elmo-shimbun.el (elmo-shimbun-get-headers): Use shimbun-server instead of
shimbun-server-internal;
Use shimbun-current-group instead of shimbun-current-group-internal.
(elmo-folder-plugged-p): Use shimbun-server instead of shimbun-server-internal.
(elmo-folder-set-plugged): Ditto.
(elmo-net-port-info): Ditto.
(elmo-folder-check): Ditto.
(elmo-folder-expand-msgdb-path): Ditto.
(elmo-folder-list-subfolders): Ditto.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index dd26df6..84708d4 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,16 @@
+2003-06-07  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* elmo-shimbun.el (elmo-shimbun-get-headers): Use shimbun-server
+	instead of shimbun-server-internal;
+	Use shimbun-current-group instead of shimbun-current-group-internal.
+	(elmo-folder-plugged-p): Use shimbun-server instead of
+	shimbun-server-internal.
+	(elmo-folder-set-plugged): Ditto.
+	(elmo-net-port-info): Ditto.
+	(elmo-folder-check): Ditto.
+	(elmo-folder-expand-msgdb-path): Ditto.
+	(elmo-folder-list-subfolders): Ditto.
+
 2003-05-18  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
 	* elmo-msgdb.el (elmo-msgdb-overview-entity-get-extra-field):
diff --git a/elmo/elmo-shimbun.el b/elmo/elmo-shimbun.el
index f290028..0ab51fe 100644
--- a/elmo/elmo-shimbun.el
+++ b/elmo/elmo-shimbun.el
@@ -193,8 +193,8 @@ update overview when message is fetched."
 
 (defun elmo-shimbun-get-headers (folder)
   (let* ((shimbun (elmo-shimbun-folder-shimbun-internal folder))
-	 (key (concat (shimbun-server-internal shimbun)
-		      "." (shimbun-current-group-internal shimbun)))
+	 (key (concat (shimbun-server shimbun)
+		      "." (shimbun-current-group shimbun)))
 	 (elmo-hash-minimum-size 63)
 	 headers)
     ;; new headers.
@@ -284,30 +284,30 @@ update overview when message is fetched."
   (elmo-plugged-p
    "shimbun"
    (and (elmo-shimbun-folder-shimbun-internal folder)
-	(shimbun-server-internal (elmo-shimbun-folder-shimbun-internal folder)))
+	(shimbun-server (elmo-shimbun-folder-shimbun-internal folder)))
    nil nil
    (and (elmo-shimbun-folder-shimbun-internal folder)
-	(shimbun-server-internal (elmo-shimbun-folder-shimbun-internal folder)))))
+	(shimbun-server (elmo-shimbun-folder-shimbun-internal folder)))))
 
 (luna-define-method elmo-folder-set-plugged ((folder elmo-shimbun-folder)
 					     plugged &optional add)
   (elmo-set-plugged plugged
 		    "shimbun"
-		    (shimbun-server-internal
+		    (shimbun-server
 		     (elmo-shimbun-folder-shimbun-internal folder))
 		    nil nil nil
-		    (shimbun-server-internal
+		    (shimbun-server
 		     (elmo-shimbun-folder-shimbun-internal folder))
 		    add))
 
 (luna-define-method elmo-net-port-info ((folder elmo-shimbun-folder))
   (list "shimbun"
-	(shimbun-server-internal
+	(shimbun-server
 	 (elmo-shimbun-folder-shimbun-internal folder))
 	nil))
 
 (luna-define-method elmo-folder-check :around ((folder elmo-shimbun-folder))
-  (when (shimbun-current-group-internal
+  (when (shimbun-current-group
 	 (elmo-shimbun-folder-shimbun-internal folder))
     (when (and (elmo-folder-plugged-p folder)
 	       (elmo-shimbun-headers-check-p folder))
@@ -325,7 +325,7 @@ update overview when message is fetched."
 (luna-define-method elmo-folder-expand-msgdb-path ((folder
 						    elmo-shimbun-folder))
   (expand-file-name
-   (concat (shimbun-server-internal
+   (concat (shimbun-server
 	    (elmo-shimbun-folder-shimbun-internal folder))
 	   "/"
 	   (elmo-shimbun-folder-group-internal folder))
@@ -504,7 +504,7 @@ update overview when message is fetched."
 	     (mapcar
 	      (lambda (fld)
 		(concat prefix
-			(shimbun-server-internal
+			(shimbun-server
 			 (elmo-shimbun-folder-shimbun-internal folder))
 			"." fld))
 	      (shimbun-groups (elmo-shimbun-folder-shimbun-internal folder)))))