Mercurial > pidgin.yaz

changeset 12855:f9401180115a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 15206] Fix a regression I introduced, as noted in SF Bug #1220557. The core now does escaping for the chat user add/remove functions. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Thu, 12 Jan 2006 21:30:59 +0000
parents 657ed70298a6
children be1cd5952a48
files src/protocols/irc/msgs.c
diffstat 1 files changed, 9 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/irc/msgs.c	Thu Jan 12 15:43:37 2006 +0000
+++ b/src/protocols/irc/msgs.c	Thu Jan 12 21:30:59 2006 +0000
@@ -56,15 +56,13 @@
 
 static void irc_chat_remove_buddy(GaimConversation *convo, char *data[2])
 {
-	char *escaped, *message;
+	char *message;
 
-	escaped = g_markup_escape_text(data[1], -1);
-	message = g_strdup_printf("quit: %s", escaped);
+	message = g_strdup_printf("quit: %s", data[1]);
 
 	if (gaim_conv_chat_find_user(GAIM_CONV_CHAT(convo), data[0]))
 		gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo), data[0], message);
 
-	g_free(escaped);
 	g_free(message);
 }
 
@@ -683,7 +681,7 @@
 {
 	GaimConnection *gc = gaim_account_get_connection(irc->account);
 	GaimConversation *convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, args[0], irc->account);
-	char *nick = irc_mask_nick(from), *buf, *reason;
+	char *nick = irc_mask_nick(from), *buf;
 
 	if (!gc) {
 		g_free(nick);
@@ -696,19 +694,17 @@
 		return;
 	}
 
-	reason = g_markup_escape_text(args[2], -1);
 	if (!gaim_utf8_strcasecmp(gaim_connection_get_display_name(gc), args[1])) {
-		buf = g_strdup_printf(_("You have been kicked by %s: (%s)"), nick, reason);
+		buf = g_strdup_printf(_("You have been kicked by %s: (%s)"), nick, args[2]);
 		gaim_conv_chat_write(GAIM_CONV_CHAT(convo), args[0], buf, GAIM_MESSAGE_SYSTEM, time(NULL));
 		g_free(buf);
 		serv_got_chat_left(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo)));
 	} else {
-		buf = g_strdup_printf(_("Kicked by %s (%s)"), nick, reason);
+		buf = g_strdup_printf(_("Kicked by %s (%s)"), nick, args[2]);
 		gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo), args[1], buf);
 		g_free(buf);
 	}
 
-	g_free(reason);
 	g_free(nick);
 	return;
 }
@@ -857,7 +853,7 @@
 {
 	GaimConnection *gc = gaim_account_get_connection(irc->account);
 	GaimConversation *convo;
-	char *nick, *msg, *escaped;
+	char *nick, *msg;
 
 	if (!args || !args[0] || !gc)
 		return;
@@ -868,19 +864,19 @@
 		return;
 	}
 
-	escaped = (args[1] && *args[1]) ? g_markup_escape_text(args[1], -1) : NULL;
 	nick = irc_mask_nick(from);
 	if (!gaim_utf8_strcasecmp(nick, gaim_connection_get_display_name(gc))) {
+		char *escaped = g_markup_escape_text(args[1], -1);
 		msg = g_strdup_printf(_("You have parted the channel%s%s"),
                                       (args[1] && *args[1]) ? ": " : "",
 									  (escaped && *escaped) ? escaped : "");
+		g_free(escaped);
 		gaim_conv_chat_write(GAIM_CONV_CHAT(convo), args[0], msg, GAIM_MESSAGE_SYSTEM, time(NULL));
 		g_free(msg);
 		serv_got_chat_left(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo)));
 	} else {
-		gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo), nick, escaped);
+		gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo), nick, args[1]);
 	}
-	g_free(escaped);
 	g_free(nick);
 }