Mercurial > pidgin
comparison libgaim/protocols/oscar/oscar.c @ 15201:83f0a2d3b441
[gaim-migrate @ 17991]
This should reduce the number of questions about encoding errors we get. it also closes rh bug 219524
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Thu, 14 Dec 2006 01:47:25 +0000 |
| parents | 8d2e6e9118e2 |
| children | b8ae75fa8d67 |
comparison
equal
deleted
inserted
replaced
| 15200:6a647ede0a76 | 15201:83f0a2d3b441 |
|---|---|
| 425 | 425 |
| 426 ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr1, FALSE); | 426 ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr1, FALSE); |
| 427 if (ret == NULL) | 427 if (ret == NULL) |
| 428 ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE); | 428 ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE); |
| 429 if (ret == NULL) | 429 if (ret == NULL) |
| 430 ret = g_strdup(_("(There was an error receiving this message. The buddy you are speaking to most likely has a buggy client.)")); | 430 ret = g_strdup(_("(There was an error receiving this message. Either you and the buddy you are speaking to have a different encoding selected, or the buddy has a buggy client.)")); |
| 431 | 431 |
| 432 return ret; | 432 return ret; |
| 433 } | 433 } |
| 434 | 434 |
| 435 /** | 435 /** |