pidgin: 921f0fad: jabber: Here's a good reason for the nam...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 921f0fad520988f2c2e279527a15f9c270bd1f59
Ancestor: 96a37da71efc2f74d925f4e24205605d06fccbb1
Author: darkrain42 at pidgin.im
Date: 2009-11-28T04:10:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/921f0fad520988f2c2e279527a15f9c270bd1f59

Modified files:
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/namespaces.h

ChangeLog: 

jabber: Here's a good reason for the namespace defines. Fix a typo 'urn:xmpp:bosh'.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/bosh.c	b43b74f09fc9797da28aa19d5ccf9c9936d11cdb
+++ libpurple/protocols/jabber/bosh.c	df36f571ff7cd80f9f38aa7ec837f0ce4ef76372
@@ -369,8 +369,8 @@ jabber_bosh_connection_send(PurpleBOSHCo
 	                "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 @@ static void jabber_bosh_connection_boot(
 	                "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);
 
============================================================
--- libpurple/protocols/jabber/namespaces.h	b95784d7ee6069ff850a75bd0b46b228fc2633ea
+++ libpurple/protocols/jabber/namespaces.h	c885ec099b585515591c2b06e47d91b4fd40ec7d
@@ -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"