pidgin: 2b1bb94c: Give some variables holding escaped vers...

[resiak at pidgin.im]

-----------------------------------------------------------------
Revision: 2b1bb94ccf5a258ba779d38122c39b153abfc288
Ancestor: d3bf1be2c95a50ec491ede54d192f5b5564d9041
Author: resiak at pidgin.im
Date: 2008-06-17T22:14:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2b1bb94ccf5a258ba779d38122c39b153abfc288

Modified files:
        libpurple/conversation.c

ChangeLog: 

Give some variables holding escaped versions of other strings more meaningful names.

-------------- next part --------------
============================================================
--- libpurple/conversation.c	6a694c5b9a7547ce5dadac60c28fe6e0ca89aa39
+++ libpurple/conversation.c	7a7043387aa8247f78093f5cd1aa32b6fdfab825
@@ -1633,18 +1633,18 @@ purple_conv_chat_add_users(PurpleConvCha
 		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 @@ purple_conv_chat_remove_users(PurpleConv
 
 		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 @@ purple_conv_chat_remove_users(PurpleConv
 					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,