Mercurial > pidgin.yaz
changeset 28161:79630bfee621
merge of '3dba2c274943bbb9eb35dbbf06b9053d9c195933'
and 'aacbe07782ea562b3fd3b7cd615f22041e73f3e6'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Tue, 04 Aug 2009 04:19:34 +0000 |
| parents | 769142e728ec (diff) 2d7931a8ee84 (current diff) |
| children | 44930be7114b |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/slp.c Tue Aug 04 04:04:21 2009 +0000 +++ b/libpurple/protocols/msn/slp.c Tue Aug 04 04:19:34 2009 +0000 @@ -342,7 +342,7 @@ file_size = GUINT32_FROM_LE(*(gsize *)(bin + 8)); file_name = g_convert(bin + 20, MAX_FILE_NAME_LEN, "UTF-8", "UTF-16LE", - NULL, NULL, &error); + NULL, NULL, NULL); g_free(bin);