Mercurial > pidgin

comparison libpurple/server.c @ 25834:94fa7211eb98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 5be7104ff151004112ce3f9c34446335024d06d8) to branch 'im.pidgin.pidgin.next.minor' (head 111d22afa901c48464e4da4d37d1cca3381ae162)
author Richard Laager <rlaager@wiktel.com>
date Fri, 14 Nov 2008 06:45:16 +0000
parents 41485746e2b9 18858e645788
children 43b721aa4b76
comparison
equal deleted inserted replaced
25833:9290eb3e07bf 25834:94fa7211eb98
260 } 260 }
261 261
262 purple_blist_server_alias_buddy(b, alias); 262 purple_blist_server_alias_buddy(b, alias);
263 263
264 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_buddy_get_name(b), account); 264 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_buddy_get_name(b), account);
265 if(conv != NULL && alias != NULL && strcmp(alias, who)) 265 if(conv != NULL && alias != NULL &&
266 who != NULL && strcmp(alias, who))
266 { 267 {
267 char *escaped = g_markup_escape_text(who, -1); 268 char *escaped = g_markup_escape_text(who, -1);
268 char *escaped2 = g_markup_escape_text(alias, -1); 269 char *escaped2 = g_markup_escape_text(alias, -1);
269 char *tmp = g_strdup_printf(_("%s is now known as %s.\n"), 270 char *tmp = g_strdup_printf(_("%s is now known as %s.\n"),
270 escaped, escaped2); 271 escaped, escaped2);