From d26c61799beeca6f07b0bf87c9ea3e3d1f355b09 Mon Sep 17 00:00:00 2001
From: interp <interp>
Date: Fri, 1 Aug 2003 15:02:43 +0000
Subject: [PATCH] Rename callback-functor to callback-function.

---
 scheme/httpd/surflets/callbacks.scm                         | 2 +-
 scheme/httpd/surflets/packages.scm                          | 2 +-
 .../surflets/web-server/root/surflets/admin-surflets.scm    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scheme/httpd/surflets/callbacks.scm b/scheme/httpd/surflets/callbacks.scm
index 29d5032..6662eab 100644
--- a/scheme/httpd/surflets/callbacks.scm
+++ b/scheme/httpd/surflets/callbacks.scm
@@ -32,6 +32,6 @@ unexpected return values from website"))))))
     (lambda args
       (annotated-address callback args))))
 
-(define callback-functor
+(define callback-function
   (lambda (req proc . args) 
     (apply proc (cons req args))))
diff --git a/scheme/httpd/surflets/packages.scm b/scheme/httpd/surflets/packages.scm
index a25f7b1..13e12de 100644
--- a/scheme/httpd/surflets/packages.scm
+++ b/scheme/httpd/surflets/packages.scm
@@ -371,7 +371,7 @@
 (define-interface surflets/callbacks-interface
   (export make-callback
 	  make-annotated-callback
-	  callback-functor))
+	  callback-function))
 
 ;; Returned-via (dispatcher for input-fields and intelligent
 ;; addresses)
diff --git a/scheme/httpd/surflets/web-server/root/surflets/admin-surflets.scm b/scheme/httpd/surflets/web-server/root/surflets/admin-surflets.scm
index 7028065..a007c6e 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/admin-surflets.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/admin-surflets.scm
@@ -83,7 +83,7 @@
       (let* ((update-text (:optional maybe-update-text ""))
 	     (loaded-surflets (sort-list! (get-loaded-surflets) string<?))
 	     (outdated? (make-outdater))
-	     (callback (make-annotated-callback callback-functor))
+	     (callback (make-annotated-callback callback-function))
 	     (title "SUrflet-Administration -- SUrflets")
 	     (header `((h1 "SUrflet Administration")
 		       (h2 "SUrflets")
@@ -179,7 +179,7 @@
 
     (define (real-sessions current-sessions update-text this-session-id)
       (let* ((outdated? (make-outdater))
-	     (callback (make-annotated-callback callback-functor))
+	     (callback (make-annotated-callback callback-function))
 	     (title  "SUrflet Adminstration - Sessions")
 	     (header `((h1 "SUrflet Administration")
 		       (h2 "Sessions")
@@ -273,7 +273,7 @@
 		    (sort-list! (get-continuations session-id)
 				continuation-id<?))
 		   (outdated? (make-outdater))
-		   (callback (make-annotated-callback callback-functor))
+		   (callback (make-annotated-callback callback-function))
 		   (header (cons header1
 				 `((h2 "Continuations of " ,session-id)
 				   (p "(belongs to the SUrflet '"