Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/bonjour/bonjour_ft.c	Thu Oct 24 22:28:48 2019 -0400
+++ b/libpurple/protocols/bonjour/bonjour_ft.c	Thu Oct 24 22:46:46 2019 -0400
@@ -219,20 +219,20 @@
 
 	/*Construct Stream initialization offer message.*/
 	si_node = purple_xmlnode_new_child(iq->node, "si");
-	purple_xmlnode_set_namespace(si_node, "http://xmpp.org/protocol/si");
-	purple_xmlnode_set_attrib(si_node, "profile", "http://xmpp.org/protocol/si/profile/file-transfer");
+	purple_xmlnode_set_namespace(si_node, "http://jabber.org/protocol/si");
+	purple_xmlnode_set_attrib(si_node, "profile", "http://jabber.org/protocol/si/profile/file-transfer");
 	g_free(xf->sid);
 	xf->sid = g_strdup(xf->iq_id);
 	purple_xmlnode_set_attrib(si_node, "id", xf->sid);
 
 	file = purple_xmlnode_new_child(si_node, "file");
-	purple_xmlnode_set_namespace(file, "http://xmpp.org/protocol/si/profile/file-transfer");
+	purple_xmlnode_set_namespace(file, "http://jabber.org/protocol/si/profile/file-transfer");
 	purple_xmlnode_set_attrib(file, "name", purple_xfer_get_filename(xfer));
 	g_snprintf(buf, sizeof(buf), "%" G_GOFFSET_FORMAT, purple_xfer_get_size(xfer));
 	purple_xmlnode_set_attrib(file, "size", buf);
 
 	feature = purple_xmlnode_new_child(si_node, "feature");
-	purple_xmlnode_set_namespace(feature, "http://xmpp.org/protocol/feature-neg");
+	purple_xmlnode_set_namespace(feature, "http://jabber.org/protocol/feature-neg");
 
 	x = purple_xmlnode_new_child(feature, "x");
 	purple_xmlnode_set_namespace(x, "xmpp:x:data");
@@ -245,12 +245,12 @@
 	if (xf->mode & XEP_BYTESTREAMS) {
 		PurpleXmlNode *option = purple_xmlnode_new_child(field, "option");
 		PurpleXmlNode *value = purple_xmlnode_new_child(option, "value");
-		purple_xmlnode_insert_data(value, "http://xmpp.org/protocol/bytestreams", -1);
+		purple_xmlnode_insert_data(value, "http://jabber.org/protocol/bytestreams", -1);
 	}
 	if (xf->mode & XEP_IBB) {
 		PurpleXmlNode *option = purple_xmlnode_new_child(field, "option");
 		PurpleXmlNode *value = purple_xmlnode_new_child(option, "value");
-		purple_xmlnode_insert_data(value, "http://xmpp.org/protocol/ibb", -1);
+		purple_xmlnode_insert_data(value, "http://jabber.org/protocol/ibb", -1);
 	}
 
 	xep_iq_send_and_free(iq);
@@ -276,11 +276,11 @@
 		return;
 
 	si_node = purple_xmlnode_new_child(iq->node, "si");
-	purple_xmlnode_set_namespace(si_node, "http://xmpp.org/protocol/si");
-	/*purple_xmlnode_set_attrib(si_node, "profile", "http://xmpp.org/protocol/si/profile/file-transfer");*/
+	purple_xmlnode_set_namespace(si_node, "http://jabber.org/protocol/si");
+	/*purple_xmlnode_set_attrib(si_node, "profile", "http://jabber.org/protocol/si/profile/file-transfer");*/
 
 	feature = purple_xmlnode_new_child(si_node, "feature");
-	purple_xmlnode_set_namespace(feature, "http://xmpp.org/protocol/feature-neg");
+	purple_xmlnode_set_namespace(feature, "http://jabber.org/protocol/feature-neg");
 
 	x = purple_xmlnode_new_child(feature, "x");
 	purple_xmlnode_set_namespace(x, "xmpp:x:data");
@@ -290,7 +290,7 @@
 	purple_xmlnode_set_attrib(field, "var", "stream-method");
 
 	value = purple_xmlnode_new_child(field, "value");
-	purple_xmlnode_insert_data(value, "http://xmpp.org/protocol/bytestreams", -1);
+	purple_xmlnode_insert_data(value, "http://jabber.org/protocol/bytestreams", -1);
 
 	xep_iq_send_and_free(iq);
 }
@@ -438,7 +438,7 @@
 
 			profile = purple_xmlnode_get_attrib(si, "profile");
 
-			if (purple_strequal(profile, "http://xmpp.org/protocol/si/profile/file-transfer")) {
+			if (purple_strequal(profile, "http://jabber.org/protocol/si/profile/file-transfer")) {
 				const char *filename = NULL, *filesize_str = NULL;
 				goffset filesize = 0;
 				PurpleXmlNode *file;
@@ -907,7 +907,7 @@
 	iq = xep_iq_new(bd, XEP_IQ_SET, purple_xfer_get_remote_user(xfer), bonjour_get_jid(bd->xmpp_data->account), xf->sid);
 
 	query = purple_xmlnode_new_child(iq->node, "query");
-	purple_xmlnode_set_namespace(query, "http://xmpp.org/protocol/bytestreams");
+	purple_xmlnode_set_namespace(query, "http://jabber.org/protocol/bytestreams");
 	purple_xmlnode_set_attrib(query, "sid", xf->sid);
 	purple_xmlnode_set_attrib(query, "mode", "tcp");
 
@@ -983,7 +983,7 @@
 	/* Notify Initiator of Connection */
 	iq = xep_iq_new(bd, XEP_IQ_RESULT, purple_xfer_get_remote_user(xfer), bonjour_get_jid(bd->xmpp_data->account), xf->iq_id);
 	q_node = purple_xmlnode_new_child(iq->node, "query");
-	purple_xmlnode_set_namespace(q_node, "http://xmpp.org/protocol/bytestreams");
+	purple_xmlnode_set_namespace(q_node, "http://jabber.org/protocol/bytestreams");
 	tmp_node = purple_xmlnode_new_child(q_node, "streamhost-used");
 	purple_xmlnode_set_attrib(tmp_node, "jid", xf->jid);
 	xep_iq_send_and_free(iq);

--- a/libpurple/protocols/bonjour/xmpp.c	Thu Oct 24 22:28:48 2019 -0400
+++ b/libpurple/protocols/bonjour/xmpp.c	Thu Oct 24 22:46:46 2019 -0400
@@ -62,7 +62,7 @@
 #define STREAM_END "</stream:stream>"
 /* TODO: specify version='1.0' and send stream features */
 #define DOCTYPE "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" \
-		"<stream:stream xmlns=\"xmpp:client\" xmlns:stream=\"http://etherx.xmpp.org/streams\" from=\"%s\" to=\"%s\">"
+		"<stream:stream xmlns=\"xmpp:client\" xmlns:stream=\"http://etherx.jabber.org/streams\" from=\"%s\" to=\"%s\">"
 
 enum sent_stream_start_types {
 	NOT_SENT       = 0,