Mercurial > pidgin

comparison libpurple/protocols/jabber/disco.c @ 26767:47d03538ee3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a bad merge (*sigh*)
author Paul Aurich <paul@darkrain42.org>
date Fri, 01 May 2009 18:57:44 +0000
parents 3912f55a1633
children 5afee99de904 84325b6e3568 72bcdcb0629f
comparison
equal deleted inserted replaced
26766:9331016df8ac 26767:47d03538ee3f
114 query = xmlnode_get_child(iq->node, "query"); 114 query = xmlnode_get_child(iq->node, "query");
115 115
116 if(node) 116 if(node)
117 xmlnode_set_attrib(query, "node", node); 117 xmlnode_set_attrib(query, "node", node);
118 118
119 if(!node || !strcmp(node, CAPS0115_NODE "#" VERSION)) { 119 if(!node || g_str_equal(node, node_uri)) {
120 identity = xmlnode_new_child(query, "identity");
121 xmlnode_set_attrib(identity, "category", "client");
122 xmlnode_set_attrib(identity, "type", "pc"); /* XXX: bot, console,
123 * handheld, pc, phone,
124 * web */
125 xmlnode_set_attrib(identity, "name", PACKAGE);
126 }
127
128 if(!node || !strcmp(node, node_uri)) {
129 GList *features, *identities; 120 GList *features, *identities;
130 for(identities = jabber_identities; identities; identities = identities->next) { 121 for(identities = jabber_identities; identities; identities = identities->next) {
131 JabberIdentity *ident = (JabberIdentity*)identities->data; 122 JabberIdentity *ident = (JabberIdentity*)identities->data;
132 identity = xmlnode_new_child(query, "identity"); 123 identity = xmlnode_new_child(query, "identity");
133 xmlnode_set_attrib(identity, "category", ident->category); 124 xmlnode_set_attrib(identity, "category", ident->category);