Mercurial > pidgin
diff libpurple/protocols/silc/buddy.c @ 16475:5e47b3427b28
propagate from branch 'im.pidgin.rlaager.gaim_migration' (head dcc40d46afbe3f87cc674e4fb1526ac722bc35cb)
to branch 'im.pidgin.pidgin' (head 0ef5b6c44115778e329fd628324124f872f5253b)
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Fri, 27 Apr 2007 02:14:44 +0000 |
| parents | a5176db228b7 24bbd7e46bfe |
| children | 6c3b44ac71f3 |
line wrap: on
line diff
--- a/libpurple/protocols/silc/buddy.c Fri Apr 27 00:28:21 2007 +0000 +++ b/libpurple/protocols/silc/buddy.c Fri Apr 27 02:14:44 2007 +0000 @@ -988,7 +988,7 @@ SilcUInt32 data_len; data = silc_mime_get_data(m, &data_len); if (data) - purple_buddy_icons_set_for_user(purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), (void *)data, data_len); + purple_buddy_icons_set_for_user(purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), g_memdup(data, data_len), data_len); } silc_mime_free(m); } @@ -1721,7 +1721,7 @@ } t = purple_buddy_icon_get_type((const PurpleBuddyIcon *)&ic); - if (!t) { + if (!t || !strcmp(t, "icon")) { g_free(ic.data); silc_mime_free(mime); return;