# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1236391377 0
# Node ID 2597de135090f54ee69031fc72276742eed1656b
# Parent  c4fd9222dda1008b6b67f1eb59532488be31c3f6
Fix up merge (why can't it simply make the changes to my WD first?)

diff -r c4fd9222dda1 -r 2597de135090 libpurple/protocols/jabber/buddy.c
--- a/libpurple/protocols/jabber/buddy.c	Sat Mar 07 01:59:40 2009 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Sat Mar 07 02:02:57 2009 +0000
@@ -495,9 +495,6 @@
 
 void jabber_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img)
 {
-	PurplePresence *gpresence;
-	PurpleStatus *status;
-
 	if(((JabberStream*)purple_connection_get_protocol_data(gc))->pep) {
 		/* XEP-0084: User Avatars */
 		if(img) {
diff -r c4fd9222dda1 -r 2597de135090 libpurple/protocols/jabber/disco.c
--- a/libpurple/protocols/jabber/disco.c	Sat Mar 07 01:59:40 2009 +0000
+++ b/libpurple/protocols/jabber/disco.c	Sat Mar 07 02:02:57 2009 +0000
@@ -126,6 +126,7 @@
 														 * handheld, pc, phone,
 														 * web */
 			xmlnode_set_attrib(identity, "name", PACKAGE);
+		}
 
 		if(!node || !strcmp(node, node_uri)) {
 			GList *features, *identities;