From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 23 May 2001 21:20:28 +0000 (+0000)
Subject: Rename URL-CONTAINER to CONTAINER-URL to better reflect its meaning.
X-Git-Tag: 20090517-FFI~2802
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=a1f06741fc36905f8a81411ee5410e45023d9245;p=mit-scheme.git

Rename URL-CONTAINER to CONTAINER-URL to better reflect its meaning.
---

diff --git a/v7/src/imail/imail-core.scm b/v7/src/imail/imail-core.scm
index d1ac2ad6b..912122d24 100644
--- a/v7/src/imail/imail-core.scm
+++ b/v7/src/imail/imail-core.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-core.scm,v 1.126 2001/05/23 13:46:26 cph Exp $
+;;; $Id: imail-core.scm,v 1.127 2001/05/23 21:20:05 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2001 Massachusetts Institute of Technology
 ;;;
@@ -137,7 +137,7 @@
 ;; E.g. the container of "imap://localhost/inbox/foo" is
 ;; "imap://localhost/inbox/" (except that for IMAP folders, the result
 ;; may be affected by the NAMESPACE prefix information).
-(define-generic url-container (url))
+(define-generic container-url (url))
 
 ;; Return a list of URLs referring to the contents of CONTAINER-URL.
 ;; The result can contain both folder and container URLs.
@@ -316,7 +316,7 @@
 (define-generic with-open-connection (url thunk))
 
 (define (container-modified! url type . arguments)
-  (let ((container (get-memoized-resource (url-container url))))
+  (let ((container (get-memoized-resource (container-url url))))
     (if container
 	(apply object-modified! container type url arguments))))
 
diff --git a/v7/src/imail/imail-file.scm b/v7/src/imail/imail-file.scm
index 990c20c19..ea35904e9 100644
--- a/v7/src/imail/imail-file.scm
+++ b/v7/src/imail/imail-file.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-file.scm,v 1.67 2001/05/23 05:05:00 cph Exp $
+;;; $Id: imail-file.scm,v 1.68 2001/05/23 21:20:09 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2001 Massachusetts Institute of Technology
 ;;;
@@ -48,7 +48,7 @@
 (define pathname-url-constructors
   (make-eq-hash-table))
 
-(define-method url-container ((url <pathname-url>))
+(define-method container-url ((url <pathname-url>))
   (make-directory-url
    (directory-pathname
     (directory-pathname-as-file (pathname-url-pathname url)))))
diff --git a/v7/src/imail/imail-imap.scm b/v7/src/imail/imail-imap.scm
index ad7c437d7..d7be4b0f4 100644
--- a/v7/src/imail/imail-imap.scm
+++ b/v7/src/imail/imail-imap.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-imap.scm,v 1.155 2001/05/23 05:05:08 cph Exp $
+;;; $Id: imail-imap.scm,v 1.156 2001/05/23 21:20:17 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2001 Massachusetts Institute of Technology
 ;;;
@@ -176,7 +176,7 @@
 
 ;;;; Container heirarchy
 
-(define-method url-container ((url <imap-url>))
+(define-method container-url ((url <imap-url>))
   (imap-url-new-mailbox
    url
    (let ((mailbox (imap-url-mailbox url)))
diff --git a/v7/src/imail/imail-top.scm b/v7/src/imail/imail-top.scm
index ebe237d1e..44c41b167 100644
--- a/v7/src/imail/imail-top.scm
+++ b/v7/src/imail/imail-top.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-top.scm,v 1.243 2001/05/23 05:05:26 cph Exp $
+;;; $Id: imail-top.scm,v 1.244 2001/05/23 21:20:28 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2001 Massachusetts Institute of Technology
 ;;;
@@ -1354,7 +1354,7 @@ The folder's type may not be changed."
 				    'REQUIRE-MATCH? #t)))
       (list from
 	    (prompt-for-folder "Rename folder to"
-			       (url-container (imail-parse-partial-url from))
+			       (container-url (imail-parse-partial-url from))
 			       'HISTORY 'IMAIL-RENAME-FOLDER-TARGET))))
   (lambda (from to)
     (let ((from (imail-parse-partial-url from))
@@ -1385,7 +1385,7 @@ If it doesn't exist, it is created first."
 				 (lambda ()
 				   (imail-parse-partial-url (car history))))))
 			   (and (url? url)
-				(url-container url)))))
+				(container-url url)))))
 		  (imail-default-container))
 	      (url-base-name (imail-parse-partial-url from)))
 	     'HISTORY 'IMAIL-COPY-FOLDER-TARGET))))