pidgin: 617013c6: Fix a bad merge (*sigh*)

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 617013c6f18c646f381db9955e57a1e1dc6392ea
Ancestor: 67b9179e8426d10b7802f6deba88ae97beeebef7
Author: darkrain42 at pidgin.im
Date: 2009-05-01T18:57:44
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/617013c6f18c646f381db9955e57a1e1dc6392ea

Modified files:
        libpurple/protocols/jabber/disco.c

ChangeLog: 

Fix a bad merge (*sigh*)

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/disco.c	92ec80d60579ff7c17e23d236e22992574da2d01
+++ libpurple/protocols/jabber/disco.c	5d2574926a8baafe240717056fd7d15224598124
@@ -116,16 +116,7 @@ void jabber_disco_info_parse(JabberStrea
 		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;