Mercurial > pidgin.yaz
changeset 23418:0b6475f97648
Give some variables holding escaped versions of other strings more meaningful names.
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Tue, 17 Jun 2008 22:14:19 +0000 |
| parents | 1c6918e48104 |
| children | d73ad65a7d5d |
| files | libpurple/conversation.c |
| diffstat | 1 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/conversation.c Tue Jun 17 21:43:23 2008 +0000 +++ b/libpurple/conversation.c Tue Jun 17 22:14:19 2008 +0000 @@ -1633,18 +1633,18 @@ cbuddies = g_list_prepend(cbuddies, cbuddy); if (!quiet && new_arrivals) { - char *escaped = g_markup_escape_text(alias, -1); + char *alias_esc = g_markup_escape_text(alias, -1); char *tmp; if (extra_msg == NULL) - tmp = g_strdup_printf(_("%s entered the room."), escaped); + tmp = g_strdup_printf(_("%s entered the room."), alias_esc); else { - char *escaped2 = g_markup_escape_text(extra_msg, -1); + char *extra_msg_esc = g_markup_escape_text(extra_msg, -1); tmp = g_strdup_printf(_("%s [<I>%s</I>] entered the room."), - escaped, escaped2); - g_free(escaped2); + alias_esc, extra_msg_esc); + g_free(extra_msg_esc); } - g_free(escaped); + g_free(alias_esc); purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LINKIFY, @@ -1832,7 +1832,7 @@ if (!quiet) { const char *alias = user; - char *escaped; + char *alias_esc; char *tmp; if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { @@ -1842,17 +1842,17 @@ alias = purple_buddy_get_contact_alias(buddy); } - escaped = g_markup_escape_text(alias, -1); + alias_esc = g_markup_escape_text(alias, -1); if (reason == NULL || !*reason) - tmp = g_strdup_printf(_("%s left the room."), escaped); + tmp = g_strdup_printf(_("%s left the room."), alias_esc); else { - char *escaped2 = g_markup_escape_text(reason, -1); + char *reason_esc = g_markup_escape_text(reason, -1); tmp = g_strdup_printf(_("%s left the room (%s)."), - escaped, escaped2); - g_free(escaped2); + alias_esc, reason_esc); + g_free(reason_esc); } - g_free(escaped); + g_free(alias_esc); purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LINKIFY,