comparison libpurple/server.c @ 24419:18858e645788

Fix CID #390
author Richard Laager <rlaager@wiktel.com>
date Fri, 14 Nov 2008 06:31:31 +0000
parents 00420530cc56
children 75690a3eeee0 94fa7211eb98
comparison
equal deleted inserted replaced
24418:4152b5c1c051 24419:18858e645788
257 } 257 }
258 258
259 purple_blist_server_alias_buddy(b, alias); 259 purple_blist_server_alias_buddy(b, alias);
260 260
261 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, account); 261 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, account);
262 if(conv != NULL && alias != NULL && strcmp(alias, who)) 262 if(conv != NULL && alias != NULL &&
263 who != NULL && strcmp(alias, who))
263 { 264 {
264 char *escaped = g_markup_escape_text(who, -1); 265 char *escaped = g_markup_escape_text(who, -1);
265 char *escaped2 = g_markup_escape_text(alias, -1); 266 char *escaped2 = g_markup_escape_text(alias, -1);
266 char *tmp = g_strdup_printf(_("%s is now known as %s.\n"), 267 char *tmp = g_strdup_printf(_("%s is now known as %s.\n"),
267 escaped, escaped2); 268 escaped, escaped2);