Index: openacs-4/packages/s5/s5.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/s5/s5.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/s5/s5.info	9 Dec 2007 20:08:32 -0000	1.4
+++ openacs-4/packages/s5/s5.info	5 May 2008 12:30:29 -0000	1.5
@@ -15,7 +15,7 @@
         <maturity>0</maturity>
 
         <provides url="s5" version="0.8"/>
-        <requires url="xowiki" version="0.79"/>
+        <requires url="xowiki" version="0.87"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/s5/tcl/s5-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/s5/tcl/s5-procs.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/s5/tcl/s5-procs.tcl	11 Feb 2008 02:26:14 -0000	1.11
+++ openacs-4/packages/s5/tcl/s5-procs.tcl	5 May 2008 12:30:29 -0000	1.12
@@ -252,18 +252,18 @@
 }
 
 
-namespace eval ::xowiki {
+namespace eval ::xowiki::formfield {
   ###########################################################
   #
-  # ::xowiki::FormField::code_listing
+  # ::xowiki::formfield::code_listing
   #
   ###########################################################
 
-  Class FormField::code_listing -superclass ::xowiki::FormField::textarea -parameter {
+  Class code_listing -superclass textarea -parameter {
     {rows 20}
     {cols 80}
   }
-  FormField::code_listing instproc pretty_value {v} {
+  code_listing instproc pretty_value {v} {
     [my object] do_substitutions 0
     return "<pre class='code'>[api_pretty_tcl [my value]]</pre>"
   }