# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1241204264 0
# Node ID 47d03538ee3f0b6df64b268586ba45b21d789684
# Parent  9331016df8ac3d2c57e1333af231f9e8c48eed25
Fix a bad merge (*sigh*)

diff -r 9331016df8ac -r 47d03538ee3f libpurple/protocols/jabber/disco.c
--- a/libpurple/protocols/jabber/disco.c	Fri May 01 16:25:56 2009 +0000
+++ b/libpurple/protocols/jabber/disco.c	Fri May 01 18:57:44 2009 +0000
@@ -116,16 +116,7 @@
 		if(node)
 			xmlnode_set_attrib(query, "node", node);
 
-		if(!node || !strcmp(node, CAPS0115_NODE "#" VERSION)) {
-			identity = xmlnode_new_child(query, "identity");
-			xmlnode_set_attrib(identity, "category", "client");
-			xmlnode_set_attrib(identity, "type", "pc"); /* XXX: bot, console,
-														 * handheld, pc, phone,
-														 * web */
-			xmlnode_set_attrib(identity, "name", PACKAGE);
-		}
-
-		if(!node || !strcmp(node, node_uri)) {
+		if(!node || g_str_equal(node, node_uri)) {
 			GList *features, *identities;
 			for(identities = jabber_identities; identities; identities = identities->next) {
 				JabberIdentity *ident = (JabberIdentity*)identities->data;