From: Magnus H. <leg...@us...> - 2008-10-16 15:57:22
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1571 Modified Files: jabber-tox.el Log Message: Update namespaces Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- jabber-tox.el 16 Oct 2008 15:50:24 -0000 1.6 +++ jabber-tox.el 16 Oct 2008 15:56:56 -0000 1.7 @@ -22,21 +22,18 @@ (require 'fsm) (require 'cl) -(defconst jingle-ns "http://www.xmpp.org/extensions/xep-0166.html#ns" +(defconst jingle-ns "urn:xmpp:jingle:0" "Jingle namespace (XEP-0166)") -(defconst jingle-error-ns "http://www.xmpp.org/extensions/xep-0166.html#ns-errors" +(defconst jingle-error-ns "urn:xmpp:jingle:errors:0" "Jingle error namespace (XEP-0166)") -(defconst jingle-audio-ns "http://www.xmpp.org/extensions/xep-0167.html#ns" - "Jingle Audio namespace (XEP-0167)") +(defconst jingle-rtp-ns "urn:xmpp:jingle:apps:rtp:0" + "Jingle RTP Sessions namespace (XEP-0167)") -(defconst jingle-ice-udp-ns "http://www.xmpp.org/extensions/xep-0176.html#ns-udp" +(defconst jingle-ice-udp-ns "urn:xmpp:jingle:transports:ice-udp:0" "Jingle ICE namespace (XEP-0176)") -(defconst jingle-udp-ns "http://www.xmpp.org/extensions/xep-0177.html" - "Jingle Raw UDP namespace (XEP-0177)") - (defvar jingle-acct-sid-map (make-hash-table :test 'equal) "Mapping from pairs of JIDs and Jingle SIDs to FSMs. The JID is the full JID of the account using the session.") @@ -195,7 +192,8 @@ (id (jabber-xml-get-attribute iq 'id)) (jingle (jabber-iq-query iq)) (contents (car (jabber-xml-get-children jingle 'content))) - (audio-content (find jingle-audio-ns (jabber-xml-node-children contents) + ;; XXX: is it really audio? + (audio-content (find jingle-rtp-ns (jabber-xml-node-children contents) :test 'string= :key 'jabber-xml-get-xmlns)) (payload-types (jabber-xml-get-children audio-content 'payload-type))) |