# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1189435573 0
# Node ID 680a3aea5eb61e7acdcf08e3c72f7c2b9ee12a8f
# Parent  d32ed28cf6455504b48285d50fcda7ce3155d7fe
Various warning fixes for the xmpp prpl.

diff -r d32ed28cf645 -r 680a3aea5eb6 libpurple/protocols/jabber/adhoccommands.c
--- a/libpurple/protocols/jabber/adhoccommands.c	Mon Sep 10 14:37:40 2007 +0000
+++ b/libpurple/protocols/jabber/adhoccommands.c	Mon Sep 10 14:46:13 2007 +0000
@@ -266,7 +266,7 @@
 	jabber_iq_send(iq);
 }
 
-void jabber_adhoc_server_execute(PurplePluginAction *action) {
+static void jabber_adhoc_server_execute(PurplePluginAction *action) {
 	JabberAdHocCommands *cmd = action->user_data;
 	if(cmd) {
 		PurpleConnection *gc = (PurpleConnection *) action->context;
diff -r d32ed28cf645 -r 680a3aea5eb6 libpurple/protocols/jabber/pep.c
--- a/libpurple/protocols/jabber/pep.c	Mon Sep 10 14:37:40 2007 +0000
+++ b/libpurple/protocols/jabber/pep.c	Mon Sep 10 14:46:13 2007 +0000
@@ -109,21 +109,22 @@
 
 void jabber_pep_publish(JabberStream *js, xmlnode *publish) {
 	JabberIq *iq;
-	
+	xmlnode *pubsub;
+
 	if(js->pep != TRUE) {
 		/* ignore when there's no PEP support on the server */
 		xmlnode_free(publish);
 		return;
 	}
-	
+
 	iq = jabber_iq_new(js, JABBER_IQ_SET);
-	
-	xmlnode *pubsub = xmlnode_new("pubsub");
+
+	pubsub = xmlnode_new("pubsub");
 	xmlnode_set_namespace(pubsub, "http://jabber.org/protocol/pubsub");
-	
+
 	xmlnode_insert_child(pubsub, publish);
-	
+
 	xmlnode_insert_child(iq->node, pubsub);
-	
+
 	jabber_iq_send(iq);
 }
diff -r d32ed28cf645 -r 680a3aea5eb6 libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Mon Sep 10 14:37:40 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Mon Sep 10 14:46:13 2007 +0000
@@ -209,9 +209,9 @@
 		js->old_length = length;
 		js->old_track = g_strdup(track);
 	}
-	
-#undef CHANGED(a,b)
-		
+
+#undef CHANGED
+
 	jabber_presence_fake_to_self(js, status);
 }
 
diff -r d32ed28cf645 -r 680a3aea5eb6 libpurple/protocols/jabber/usermood.c
--- a/libpurple/protocols/jabber/usermood.c	Mon Sep 10 14:37:40 2007 +0000
+++ b/libpurple/protocols/jabber/usermood.c	Mon Sep 10 14:46:13 2007 +0000
@@ -127,18 +127,17 @@
 		}
 	}
 	if (newmood != NULL) {
+		const char *status_id;
 		JabberBuddyResource *resource = jabber_buddy_find_resource(buddy, NULL);
 		if(!resource) { /* huh? */
-			if (moodtext)
-				g_free(moodtext);
+			g_free(moodtext);
 			return;
 		}
-		const char *status_id = jabber_buddy_state_get_status_id(resource->state);
-		
+		status_id = jabber_buddy_state_get_status_id(resource->state);
+
 		purple_prpl_got_user_status(js->gc->account, from, status_id, "mood", _(newmood), "moodtext", moodtext?moodtext:"", NULL);
 	}
-	if (moodtext)
-		g_free(moodtext);
+	g_free(moodtext);
 }
 
 void jabber_mood_init(void) {
diff -r d32ed28cf645 -r 680a3aea5eb6 libpurple/protocols/jabber/xdata.c
--- a/libpurple/protocols/jabber/xdata.c	Mon Sep 10 14:37:40 2007 +0000
+++ b/libpurple/protocols/jabber/xdata.c	Mon Sep 10 14:46:13 2007 +0000
@@ -172,8 +172,8 @@
 		data->values = g_slist_delete_link(data->values, data->values);
 	}
 	if (data->actions) {
+		GList *action;
 		hasActions = TRUE;
-		GList *action;
 		for(action = data->actions; action; action = g_list_next(action)) {
 			g_free(action->data);
 		}