Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/buddy.c @ 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 | 63a5274d03cc |
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) {