diff libpurple/protocols/jabber/disco.c @ 25741:1225f3dcf5ab

Fix compilation errors and many warnings
author Paul Aurich <paul@darkrain42.org>
date Thu, 20 Nov 2008 23:58:17 +0000
parents ba362a67278c
children 4040da08a733
line wrap: on
line diff
--- a/libpurple/protocols/jabber/disco.c	Thu Nov 20 21:57:52 2008 +0000
+++ b/libpurple/protocols/jabber/disco.c	Thu Nov 20 23:58:17 2008 +0000
@@ -97,7 +97,7 @@
 
 		xmlnode *in_query;
 		const char *node = NULL;
-		const char *node_uri = NULL;
+		char *node_uri = NULL;
 		
 		// create custom caps node URI
 		node_uri = g_strconcat(CAPS0115_NODE, "#", jabber_caps_get_own_hash(), NULL);
@@ -120,7 +120,7 @@
 
 
 		if(!node || !strcmp(node, node_uri)) {
-			GList *identities;
+			GList *features, *identities;
 			for(identities = jabber_identities; identities; identities = identities->next) {
 				JabberIdentity *ident = (JabberIdentity*)identities->data;
 				identity = xmlnode_new_child(query, "identity");
@@ -128,7 +128,6 @@
 				xmlnode_set_attrib(identity, "type", ident->type);
 				if (ident->name != 0) xmlnode_set_attrib(identity, "name", ident->name);
 			}
-			GList *features;
 			for(features = jabber_features; features; features = features->next) {
 				JabberFeature *feat = (JabberFeature*)features->data;
 				if(feat->is_enabled == NULL || feat->is_enabled(js, feat->namespace) == TRUE) {