Mercurial > pidgin.yaz
comparison libpurple/protocols/msnp9/msg.c @ 27937:1337d2813b2d
propagate from branch 'im.pidgin.pidgin' (head 5ab68ddb0251205f7ef97f4c280e65696cbd5ff2)
to branch 'im.pidgin.pidgin.yaz' (head 7a5d48783707dd377fd754961d3b009c3e492827)
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Tue, 07 Apr 2009 14:32:50 +0000 |
| parents | acef4202e147 |
| children |
comparison
equal
deleted
inserted
replaced
| 26588:1a94a964bddf | 27937:1337d2813b2d |
|---|---|
| 523 if (msg->body != NULL) | 523 if (msg->body != NULL) |
| 524 g_free(msg->body); | 524 g_free(msg->body); |
| 525 | 525 |
| 526 if (data != NULL && len > 0) | 526 if (data != NULL && len > 0) |
| 527 { | 527 { |
| 528 msg->body = g_malloc0(len + 1); | 528 msg->body = botch_utf((gchar *)data, len, &msg->body_len); /* yaz */ |
| 529 memcpy(msg->body, data, len); | |
| 530 msg->body_len = len; | |
| 531 } | 529 } |
| 532 else | 530 else |
| 533 { | 531 { |
| 534 msg->body = NULL; | 532 msg->body = NULL; |
| 535 msg->body_len = 0; | 533 msg->body_len = 0; |