Mercurial > pidgin

comparison libpurple/server.c @ 28535:43d5face5d9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** Plucked rev 212bd3655451599364562cabe553c5b7a19134ae (zacw@adiumx.com): Fix printing \"...is known as...\" only in cases where the name didn't change.
author Paul Aurich <paul@darkrain42.org>
date Fri, 13 Nov 2009 18:34:04 +0000
parents 6ef2cfa15ae7
children 91e8402106c1 3828a61c44da
comparison
equal deleted inserted replaced
28534:738cd1adb3cf 28535:43d5face5d9b
256 continue; 256 continue;
257 257
258 purple_blist_server_alias_buddy(b, alias); 258 purple_blist_server_alias_buddy(b, alias);
259 259
260 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_buddy_get_name(b), account); 260 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_buddy_get_name(b), account);
261 if (conv != NULL && alias != NULL && purple_strequal(alias, who)) 261 if (conv != NULL && alias != NULL && !purple_strequal(alias, who))
262 { 262 {
263 char *escaped = g_markup_escape_text(who, -1); 263 char *escaped = g_markup_escape_text(who, -1);
264 char *escaped2 = g_markup_escape_text(alias, -1); 264 char *escaped2 = g_markup_escape_text(alias, -1);
265 char *tmp = g_strdup_printf(_("%s is now known as %s.\n"), 265 char *tmp = g_strdup_printf(_("%s is now known as %s.\n"),
266 escaped, escaped2); 266 escaped, escaped2);