# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1225069024 0
# Node ID b51732ec65e4606aff55a4b80ac6d22de82d5470
# Parent  5afa979d57fcfe88a2eddf3958fddbe2552e2091# Parent  00420530cc569db4a714b3e99be7f07778b4f8e4
merge of '8abde19f1f7825af2ea2d62b7a00e1de7afd6492'
     and '9af1b5054f770dc244dcad8b55bdb61c0f3347a4'

diff -r 5afa979d57fc -r b51732ec65e4 libpurple/server.c
--- a/libpurple/server.c	Mon Oct 27 00:31:05 2008 +0000
+++ b/libpurple/server.c	Mon Oct 27 00:57:04 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);
 		}
 	}
 }