Mercurial > pidgin.yaz
comparison libpurple/server.c @ 27906:6ecfc6b9667c
propagate from branch 'im.pidgin.pidgin' (head ca4b6e987b967927b0f8bd001bc33440a6885000)
to branch 'im.pidgin.pidgin.yaz' (head 7a92169e2ac82026d2b2918ed9662c7fd42e3280)
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Mon, 17 Nov 2008 06:15:33 +0000 |
parents | b5e2be33a17a 18858e645788 |
children | 45434c3fd878 |
comparison
equal
deleted
inserted
replaced
27905:45ce87f9a07f | 27906:6ecfc6b9667c |
---|---|
263 alias2 = sanitize_utf(alias, strlen(alias), &dummy); | 263 alias2 = sanitize_utf(alias, strlen(alias), &dummy); |
264 | 264 |
265 purple_blist_server_alias_buddy(b, alias2); | 265 purple_blist_server_alias_buddy(b, alias2); |
266 | 266 |
267 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, account); | 267 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, account); |
268 if(conv != NULL && alias2 != NULL && strcmp(alias2, who)) | 268 if(conv != NULL && alias2 != NULL && |
269 who != NULL && strcmp(alias2, who)) | |
269 { | 270 { |
270 char *escaped = g_markup_escape_text(who, -1); | 271 char *escaped = g_markup_escape_text(who, -1); |
271 char *escaped2 = g_markup_escape_text(alias2, -1); | 272 char *escaped2 = g_markup_escape_text(alias2, -1); |
272 char *tmp = g_strdup_printf(_("%s is now known as %s.\n"), | 273 char *tmp = g_strdup_printf(_("%s is now known as %s.\n"), |
273 escaped, escaped2); | 274 escaped, escaped2); |