Mercurial > pidgin.yaz
diff libpurple/server.c @ 26028:bcad7dc4b453
propagate from branch 'im.pidgin.pidgin' (head 633ffe234af48ead3631ae62e23840b4438fcf5f)
to branch 'im.pidgin.maiku.vv' (head 5585b8e919d9adb0eb491c714768027e81f1918c)
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Thu, 06 Nov 2008 03:20:05 +0000 |
| parents | 4bc74deeb503 00420530cc56 |
| children | b9d4ab2c84c6 |
line wrap: on
line diff
--- a/libpurple/server.c Thu Nov 06 02:21:16 2008 +0000 +++ b/libpurple/server.c Thu Nov 06 03:20:05 2008 +0000 @@ -264,14 +264,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); } } }