comparison: libgaim/protocols/oscar/oscar.c
libgaim/protocols/oscar/oscar.c
- changeset 15268
- e2eb75317f79
- parent 15264
- ef84d066912c
- child 15274
- 19f6578ddb99
equal
deleted
inserted
replaced
| 15267:d64d9bf73cd4 | 15268:e2eb75317f79 |
|---|---|
| 431 | 431 |
| 432 str = g_malloc(datalen + 1); | 432 str = g_malloc(datalen + 1); |
| 433 strncpy(str, datalen, data); | 433 strncpy(str, datalen, data); |
| 434 str[datalen] = '\0'; | 434 str[datalen] = '\0'; |
| 435 salvage = gaim_utf8_salvage(str); | 435 salvage = gaim_utf8_salvage(str); |
| 436 ret = g_strdup_printf(_("%s (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.)"), salvage); | 436 ret = g_strdup_printf("%s %s", salvage, |
| 437 _("(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.)")); | |
| 437 g_free(str); | 438 g_free(str); |
| 438 g_free(salvage); | 439 g_free(salvage); |
| 439 } | 440 } |
| 440 | 441 |
| 441 return ret; | 442 return ret; |
