merge of 'fe2bd47c565b8e76eb78d5dad64286292e9194c2'

Mon, 27 Oct 2008 00:57:04 +0000

author
Stu Tomlinson <nosnilmot@pidgin.im>
date
Mon, 27 Oct 2008 00:57:04 +0000
changeset 24527
f7dd45359865
parent 24522
fe2bd47c565b (current diff)
parent 24526
c302510b1137 (diff)
child 24528
f5b06eefd07f

merge of 'fe2bd47c565b8e76eb78d5dad64286292e9194c2'
and 'c302510b1137f7dee34786956ae355bf0a3ba4a4'

--- 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);
 		}
 	}
 }

mercurial