Mercurial > pidgin.yaz
changeset 29045:931d6906291b
jabber: Here's a good reason for the namespace defines. Fix a typo 'urn:xmpp:bosh'.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 28 Nov 2009 04:10:37 +0000 |
| parents | 5b449584fead |
| children | 8d79af63f18b |
| files | libpurple/protocols/jabber/bosh.c libpurple/protocols/jabber/namespaces.h |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/bosh.c Sat Nov 28 04:05:17 2009 +0000 +++ b/libpurple/protocols/jabber/bosh.c Sat Nov 28 04:10:37 2009 +0000 @@ -369,8 +369,8 @@ "sid='%s' " "to='%s' " "xml:lang='en' " - "xmlns='http://jabber.org/protocol/httpbind' " - "xmlns:xmpp='urn:xmpp:xbosh'", + "xmlns='" NS_BOSH "' " + "xmlns:xmpp='" NS_XMPP_BOSH "'", ++conn->rid, conn->sid, conn->js->user->domain); @@ -567,13 +567,13 @@ "xml:lang='en' " "xmpp:version='1.0' " "ver='1.6' " - "xmlns:xmpp='urn:xmpp:bosh' " + "xmlns:xmpp='" NS_XMPP_BOSH "' " "rid='%" G_GUINT64_FORMAT "' " /* TODO: This should be adjusted/adjustable automatically according to * realtime network behavior */ "wait='60' " "hold='1' " - "xmlns='http://jabber.org/protocol/httpbind'/>", + "xmlns='" NS_BOSH "'/>", conn->js->user->domain, ++conn->rid);
--- a/libpurple/protocols/jabber/namespaces.h Sat Nov 28 04:05:17 2009 +0000 +++ b/libpurple/protocols/jabber/namespaces.h Sat Nov 28 04:10:37 2009 +0000 @@ -60,6 +60,9 @@ #define NS_AVATAR_1_1_DATA "urn:xmpp:avatar:data" #define NS_AVATAR_1_1_METADATA "urn:xmpp:avatar:metadata" +/* XEP-0124 Bidirectional-streams Over Synchronous HTTP (BOSH) */ +#define NS_BOSH "http://jabber.org/protocol/httpbind" + /* XEP-0191 Simple Communications Blocking */ #define NS_SIMPLE_BLOCKING "urn:xmpp:blocking" @@ -73,6 +76,9 @@ #define NS_DELAYED_DELIVERY "urn:xmpp:delay" #define NS_DELAYED_DELIVERY_LEGACY "jabber:x:delay" +/* XEP-0206 */ +#define NS_XMPP_BOSH "urn:xmpp:xbosh" + /* XEP-0224 Attention */ #define NS_ATTENTION "urn:xmpp:attention:0"