[cl-xmpp-cvs] CVS cl-xmpp

[jstecklina]

Update of /project/cl-xmpp/cvsroot/cl-xmpp
In directory clnet:/tmp/cvs-serv29735

Modified Files:
	cl-xmpp.lisp 
Log Message:
Replaced fix to namespace problem by suggestion of David Lichteblau

--- /project/cl-xmpp/cvsroot/cl-xmpp/cl-xmpp.lisp	2007/03/03 18:42:08	1.29
+++ /project/cl-xmpp/cvsroot/cl-xmpp/cl-xmpp.lisp	2007/03/04 04:26:23	1.30
@@ -1,4 +1,4 @@
-;;;; $Id: cl-xmpp.lisp,v 1.29 2007/03/03 18:42:08 jstecklina Exp $
+;;;; $Id: cl-xmpp.lisp,v 1.30 2007/03/04 04:26:23 jstecklina Exp $
 ;;;; $Source: /project/cl-xmpp/cvsroot/cl-xmpp/cl-xmpp.lisp,v $
 
 ;;;; See the LICENSE file for licensing information.
@@ -316,16 +316,6 @@
       (when stanza-callback
 	(car (funcall stanza-callback stanza connection :dom-repr dom-repr)))))))
 
-;;; XXX: Kludge. Newer versions of CXML rebind *namespace-bindings*
-;;; inside of parse-xstream, so the old method of augmenting
-;;; *namespace-bindings* inside of read-stanza does not work any
-;;; longer. - Julian Stecklina (Mar 03, 2007)
-
-(unless (assoc #"stream" cxml::*initial-namespace-bindings*
-	       :test #'runes:rod=)
-  (push (cons #"stream" #"http://etherx.jabber.org/streams")
-	cxml::*initial-namespace-bindings*))
-
 (defun read-stanza (connection)
   (unless (server-xstream connection)
     (setf (server-xstream connection)
@@ -337,9 +327,13 @@
 			      :uri nil))))
   (force-output (server-stream connection))
   (catch 'stanza
-    (cxml::parse-xstream (server-xstream connection)
-			 (make-instance 'stanza-handler))
-    (runes::write-xstream-buffer (server-xstream connection))))
+    (let ((cxml::*initial-namespace-bindings*
+           (acons #"stream"
+                  #"http://etherx.jabber.org/streams"
+                  cxml::*initial-namespace-bindings*)))
+      (cxml::parse-xstream (server-xstream connection)
+                           (make-instance 'stanza-handler))
+      (runes::write-xstream-buffer (server-xstream connection)))))
  
 (defmacro with-xml-stream ((stream connection) &body body)
   "Helper macro to make it easy to control outputting XML