cpw.darkrain42.xmpp.bosh: 946fe0d8: Fix up merge (why can't it simply make t...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 946fe0d8f207844c7ef68b5851f58be505b8db4e
Ancestor: 647e850be02078fc8e1d088b49b0b8a8d0eb998e
Author: paul at darkrain42.org
Date: 2009-03-07T02:02:57
Branch: im.pidgin.cpw.darkrain42.xmpp.bosh
URL: http://d.pidgin.im/viewmtn/revision/info/946fe0d8f207844c7ef68b5851f58be505b8db4e

Modified files:
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c

ChangeLog: 

Fix up merge (why can't it simply make the changes to my WD first?)

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/buddy.c	b690f0c8bbbd01e2923094ae27ba300b8fc95e9a
+++ libpurple/protocols/jabber/buddy.c	fe082c1889f2922b45192f3bb1a06bb36488287e
@@ -495,9 +495,6 @@ void jabber_set_buddy_icon(PurpleConnect
 
 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) {
============================================================
--- libpurple/protocols/jabber/disco.c	98a25582c80f989c5ea527cfce53089ef1e9170b
+++ libpurple/protocols/jabber/disco.c	b227d64448387025d36fa67a6cc409842a92d787
@@ -126,6 +126,7 @@ void jabber_disco_info_parse(JabberStrea
 														 * handheld, pc, phone,
 														 * web */
 			xmlnode_set_attrib(identity, "name", PACKAGE);
+		}
 
 		if(!node || !strcmp(node, node_uri)) {
 			GList *features, *identities;