Mercurial > pidgin
changeset 31543:2919dee50112
merge of '24528e4f31b9f94a34143911113dc52ec45fb69f'
and '2e5091744455ac1d4bfe149a858914dfe02588cc'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 05 May 2011 02:42:42 +0000 |
| parents | 2ef7fb1f1154 (diff) f05b05d952cc (current diff) |
| children | 313fcc5be568 |
| files | |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/presence.c Wed May 04 19:59:28 2011 +0000 +++ b/libpurple/protocols/jabber/presence.c Thu May 05 02:42:42 2011 +0000 @@ -1213,7 +1213,6 @@ if (photo) { char *hash_tmp = xmlnode_get_data(photo); - hash_tmp = xmlnode_get_data(photo); g_free(presence->vcard_avatar_hash); presence->vcard_avatar_hash = hash_tmp ? hash_tmp : g_strdup("");