Mercurial > pidgin.yaz
changeset 31504:00bd105ebe4d
merge of '5cc540d254209e86098cf202fc57169624ae9cee'
and 'a76cda57800f3e69f699905c2ea77d992a685dfc'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 19 Dec 2010 22:43:36 +0000 |
| parents | 008b24923a77 (diff) 50e07cb5c254 (current diff) |
| children | 2d67b61edf07 |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Sun Dec 19 22:36:42 2010 +0000 +++ b/NEWS Sun Dec 19 22:43:36 2010 +0000 @@ -3,6 +3,12 @@ Our development blog is available at: http://planet.pidgin.im 2.7.8 (??/??/????): + Elliott: OK, so I know a few things broke with the last release, and + it's too bad we had to rush it for that silly certificate thing that + the MSN people can't configure properly. I've certainly done a lot of + small fixes this time, but it's too bad we haven't been able to get the + transfers with the official client fixed yet. I promise it'll be in + the next release (barring any quick security issues). 2.7.7 (11/23/2010): John: Well, this time around, we should finally have the certificate
--- a/libpurple/protocols/msn/xfer.c Sun Dec 19 22:36:42 2010 +0000 +++ b/libpurple/protocols/msn/xfer.c Sun Dec 19 22:43:36 2010 +0000 @@ -225,6 +225,9 @@ if (header->type == 0 && len > header->length) { header->preview_len = len - header->length; header->preview = g_memdup(buf, header->preview_len); + } else { + header->preview_len = 0; + header->preview = NULL; } return header;