tox jabber-tox.el,1.31,1.32

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17961

Modified Files:
	jabber-tox.el 
Log Message:
Partly fix handling of transport-info messages

Index: jabber-tox.el
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- jabber-tox.el	11 Jan 2009 00:29:30 -0000	1.31
+++ jabber-tox.el	11 Jan 2009 01:06:52 -0000	1.32
@@ -352,20 +352,24 @@
        (list :pending state-data)))
 
     (:iq-set
+     (fsm-debug-output "iq-set event is %S" event)
      (let* ((jc (plist-get state-data :jc))
 	    (iq (cdr event)))
-       (jabber-xml-let-attributes (action) iq
+       (jabber-xml-let-attributes (action) (jabber-iq-query iq)
+	 (fsm-debug-output "action is %S" action)
 	 (cond
 	  ((string= action "transport-info")
+	   (fsm-debug-output "transport-info is %S" iq)
 	   (let ((tox-session (plist-get state-data :tox-session))
 		 (candidates
 		  (jabber-xml-get-children
 		   (jabber-xml-path 
 		    iq
-		    `(jingle (transport . ,jingle-ice-udp-ns)))
+		    `(jingle content (,jingle-ice-udp-ns . "transport")))
 		   'candidate)))
 	     ;; XXX: send iq error for no candidates
 	     (when candidates
+	       (fsm-debug-output "Adding remote candidate...")
 	       (dbus-call-method :session tox-name tox-session tox-session-interface
 				 "AddRemoteCandidate"
 				 (mapcar