Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 25987:c4fd9222dda1 | 25988:2597de135090 |
|---|---|
| 493 } | 493 } |
| 494 } | 494 } |
| 495 | 495 |
| 496 void jabber_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img) | 496 void jabber_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img) |
| 497 { | 497 { |
| 498 PurplePresence *gpresence; | |
| 499 PurpleStatus *status; | |
| 500 | |
| 501 if(((JabberStream*)purple_connection_get_protocol_data(gc))->pep) { | 498 if(((JabberStream*)purple_connection_get_protocol_data(gc))->pep) { |
| 502 /* XEP-0084: User Avatars */ | 499 /* XEP-0084: User Avatars */ |
| 503 if(img) { | 500 if(img) { |
| 504 /* | 501 /* |
| 505 * TODO: This is pretty gross. The Jabber PRPL really shouldn't | 502 * TODO: This is pretty gross. The Jabber PRPL really shouldn't |