Mercurial > pidgin
changeset 16024:b60aaf9da8b1
merge of 'ada29b7febfe2747e4e0a7178ca7dc11ae261d92'
and 'd4522ac7da3100609f31e0ef1c263b8aad750136'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 09 Apr 2007 03:20:40 +0000 |
| parents | de619a9523f9 (diff) fab49f913709 (current diff) |
| children | 01c22d9a60f9 326e6a503724 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Mon Apr 09 02:27:05 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Mon Apr 09 03:20:40 2007 +0000 @@ -4761,7 +4761,8 @@ PurpleBuddy *b; struct aim_ssi_item *curitem; guint32 tmp; - const char *icon_path, *cached_icon_path; + const char *icon_path; + char *cached_icon_path; va_list ap; guint16 fmtver, numitems; guint32 timestamp; @@ -4997,6 +4998,7 @@ icon_path = purple_account_get_buddy_icon(account); cached_icon_path = purple_buddy_icons_get_full_path(icon_path); oscar_set_icon(gc, cached_icon_path); + g_free(cached_icon_path); return 1; }
--- a/libpurple/protocols/yahoo/yahoo_picture.c Mon Apr 09 02:27:05 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_picture.c Mon Apr 09 03:20:40 2007 +0000 @@ -544,6 +544,7 @@ int expire = purple_account_get_int(account, YAHOO_PICEXPIRE_SETTING, 0); const char *oldurl = purple_account_get_string(account, YAHOO_PICURL_SETTING, NULL); + g_free(icondata); yd->picture_checksum = g_string_hash(s); if ((yd->picture_checksum == oldcksum) &&