changeset 25988:2597de135090

Fix up merge (why can't it simply make the changes to my WD first?)
author Paul Aurich <paul@darkrain42.org>
date Sat, 07 Mar 2009 02:02:57 +0000
parents c4fd9222dda1
children 035ba9355361
files libpurple/protocols/jabber/buddy.c libpurple/protocols/jabber/disco.c
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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) {
--- 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;