Mercurial > pidgin
changeset 24309:a548c565780f
merge of '9af1b5054f770dc244dcad8b55bdb61c0f3347a4'
and 'ac620b61f3dbe3da2184888eb05a0f637c3cd245'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Mon, 27 Oct 2008 00:17:33 +0000 |
| parents | 00420530cc56 (diff) 040c66dffbf0 (current diff) |
| children | e54d7fff1ad2 |
| files | |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/server.c Sun Oct 26 17:23:40 2008 +0000 +++ b/libpurple/server.c Mon Oct 27 00:17:33 2008 +0000 @@ -261,14 +261,18 @@ conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, account); if(conv != NULL && alias != NULL && strcmp(alias, who)) { + char *escaped = g_markup_escape_text(who, -1); + char *escaped2 = g_markup_escape_text(alias, -1); char *tmp = g_strdup_printf(_("%s is now known as %s.\n"), - who, alias); + escaped, escaped2); purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LINKIFY, time(NULL)); g_free(tmp); + g_free(escaped2); + g_free(escaped); } } }