Index: build-guile-gtk
===================================================================
RCS file: /cvs/gnome/gnome-guile/guile-gtk/build-guile-gtk,v
retrieving revision 1.40
diff -u -r1.40 build-guile-gtk
--- build-guile-gtk	2001/07/24 22:48:42	1.40
+++ build-guile-gtk	2002/01/25 16:11:27
@@ -980,7 +980,7 @@
       (if (null? multiple-values)
 	  (@ "~%  return ~a;~%}~%~%" (type-c2scm rtype "cr_ret" rcopy))
 	  (begin
-	    (@ "~%  ret_list = SCM_LIST0;")
+	    (@ "~%  ret_list = SCM_UNSPECIFIED;")
 	    (for-each (lambda (ret)
 			(@ "~%  ret_list = scm_cons(~a, ret_list);"
 			   (type-c2scm (lookup-type (car ret))
@@ -1136,9 +1136,9 @@
    'string 
    (make-type "string" "char*"
 	      (lambda (x) 
-		(@@ "(SCM_NIMP(~a) && SCM_RWSTRINGP(~a))" x x))
+		(@@ "(SCM_NIMP(~a) && SCM_STRINGP(~a))" x x))
 	      (lambda (x) 
-		(@@ "((~a) == SCM_BOOL_F? NULL : SCM_CHARS(~a))" x x))
+		(@@ "((~a) == SCM_BOOL_F? NULL : SCM_STRING_CHARS(~a))" x x))
 	      (lambda (x copy) 
 		(@@ "(~a == NULL? SCM_BOOL_F : scm_take0str (~a))" x x))
 	      'fit-for-list #t
@@ -1148,9 +1148,9 @@
    'cstring 
    (make-type "cstring" "const char*"
 	      (lambda (x) 
-		(@@ "(SCM_NIMP(~a) && SCM_RWSTRINGP(~a))" x x))
+		(@@ "(SCM_NIMP(~a) && SCM_STRINGP(~a))" x x))
 	      (lambda (x) 
-		(@@ "((~a) == SCM_BOOL_F? NULL : SCM_CHARS(~a))" x x))
+		(@@ "((~a) == SCM_BOOL_F? NULL : SCM_STRING_CHARS(~a))" x x))
 	      (lambda (x copy) 
 		(@@ "(~a == NULL? SCM_BOOL_F : scm_take0str (~a))" x x))
 	      'fit-for-list #t