changeset 26849:47d03538ee3f

Fix a bad merge (*sigh*)
author Paul Aurich <paul@darkrain42.org>
date Fri, 01 May 2009 18:57:44 +0000
parents 9331016df8ac
children 966d2f2f86c8
files libpurple/protocols/jabber/disco.c
diffstat 1 files changed, 1 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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;