--- a/examples/pubsub.lua	Fri Mar 27 12:06:19 2009 +0200
+++ b/examples/pubsub.lua	Sat Mar 28 19:43:12 2009 +0200
@@ -3,9 +3,8 @@
 
 -- library
 
-local lm = require 'lm'
-local iq = require 'iq'
-require 'x_data'
+local iq     = require 'iq'
+local x_data = require 'x_data'
 
 --
 
@@ -163,11 +162,10 @@
 			if x then
 				success ( x_data.parse ( x ),
 					function ( form, success, fail )
-						form.type = 'submit'
 						iq.send ( conn, to, 'set',
 							{
 								pubsub = { xmlns = 'http://jabber.org/protocol/pubsub#owner',
-									configure = form.format ( form, { node = node } ),
+									configure = form:format ( { node = node }, 'submit' ),
 								},
 							}, success, fail )
 					end,
@@ -175,9 +173,7 @@
 						iq.send ( conn, to, 'set',
 							{
 								pubsub = { xmlns = 'http://jabber.org/protocol/pubsub#owner',
-									configure = { node = node,
-										x = { xmlns = 'jabber:x:data', type = 'cancel' }, -- FIXME
-									},
+									configure = form:format ( { node = node }, 'cancel' ),
 								},
 							}, success, fail )
 					end )