Fix some namespace changes that I made accidentally. Also add a G_UNLIKELY

macro call where Eion points out it could be useful.

3 files changed, 7 insertions, 7 deletions

diff --git a/libpurple/protocols/bonjour/bonjour_ft.c b/libpurple/protocols/bonjour/bonjour_ft.c
index bc64d02d4a..92efa5d42c 100644
--- a/libpurple/protocols/bonjour/bonjour_ft.c
+++ b/libpurple/protocols/bonjour/bonjour_ft.c
@@ -235,7 +235,7 @@ xep_ft_si_offer(PurpleXfer *xfer, const gchar *to)
 	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");
+	purple_xmlnode_set_namespace(x, "jabber:x:data");
 	purple_xmlnode_set_attrib(x, "type", "form");
 
 	field = purple_xmlnode_new_child(x, "field");
@@ -283,7 +283,7 @@ xep_ft_si_result(PurpleXfer *xfer, const char *to)
 	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");
+	purple_xmlnode_set_namespace(x, "jabber:x:data");
 	purple_xmlnode_set_attrib(x, "type", "submit");
 
 	field = purple_xmlnode_new_child(x, "field");
diff --git a/libpurple/protocols/bonjour/parser.c b/libpurple/protocols/bonjour/parser.c
index 54bf68478f..4b1cde5bd9 100644
--- a/libpurple/protocols/bonjour/parser.c
+++ b/libpurple/protocols/bonjour/parser.c
@@ -155,7 +155,7 @@ bonjour_parser_structured_error_handler(void *user_data, xmlErrorPtr error)
 {
 	BonjourXMPPConversation *bconv = user_data;
 
-	purple_debug_error("xmpp", "XML parser error for BonjourXMPPConversation %p: "
+	purple_debug_error("bonjour", "XML parser error for BonjourXMPPConversation %p: "
 	                             "Domain %i, code %i, level %i: %s",
 	                   bconv,
 	                   error->domain, error->code, error->level,
diff --git a/libpurple/protocols/bonjour/xmpp.c b/libpurple/protocols/bonjour/xmpp.c
index b31862b30d..2ce43140b8 100644
--- a/libpurple/protocols/bonjour/xmpp.c
+++ b/libpurple/protocols/bonjour/xmpp.c
@@ -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.jabber.org/streams\" from=\"%s\" to=\"%s\">"
+		"<stream:stream xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\" from=\"%s\" to=\"%s\">"
 
 enum sent_stream_start_types {
 	NOT_SENT       = 0,
@@ -147,7 +147,7 @@ _xmpp_parse_and_write_message_to_ui(PurpleXmlNode *message_node, PurpleBuddy *pb
 		return;
 	}
 
-	events_node = purple_xmlnode_get_child_with_namespace(message_node, "x", "xmpp:x:event");
+	events_node = purple_xmlnode_get_child_with_namespace(message_node, "x", "jabber:x:event");
 	if (events_node != NULL) {
 		if (purple_xmlnode_get_child(events_node, "id") != NULL) {
 			/* The user is just typing */
@@ -514,7 +514,7 @@ _start_stream(GObject *stream, gpointer data)
 	}
 
 	/* This is EXTREMELY unlikely to happen */
-	if (ret < len) {
+	if (G_UNLIKELY(ret < len)) {
 		char *tmp = g_strdup(ss->msg + ret);
 		g_free(ss->msg);
 		ss->msg = tmp;
@@ -1090,7 +1090,7 @@ bonjour_xmpp_send_message(BonjourXMPP *jdata, const gchar *to, const gchar *body
 	purple_xmlnode_insert_child(node, node2);
 
 	node = purple_xmlnode_new_child(message_node, "x");
-	purple_xmlnode_set_namespace(node, "xmpp:x:event");
+	purple_xmlnode_set_namespace(node, "jabber:x:event");
 	purple_xmlnode_insert_child(node, purple_xmlnode_new("composing"));
 
 	message = purple_xmlnode_to_str(message_node, NULL);