# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1000754541 0
# Node ID b5b7dece5249b80feece520e9c96cb866f4bc164
# Parent  57da45349e5034798edd49da541482f334c8435b
[gaim-migrate @ 2309]
wee

committer: Tailor Script <tailor@pidgin.im>

diff -r 57da45349e50 -r b5b7dece5249 src/protocols/irc/irc.c
--- a/src/protocols/irc/irc.c	Mon Sep 17 19:13:12 2001 +0000
+++ b/src/protocols/irc/irc.c	Mon Sep 17 19:22:21 2001 +0000
@@ -742,7 +742,7 @@
 					word[3], *word_eol[5] == ':' ? word_eol[5] + 1: word_eol[5]);
 			do_error_dialog(outbuf, _("IRC Error"));
 		} else
-			irc_rem_chat_bud(gc, nick);
+			irc_rem_chat_bud(gc, word[4]);
 	} else if (!strcmp(cmd, "KILL")) { /* */
 	} else if (!strcmp(cmd, "MODE")) {
 		handle_mode(gc, word, word_eol, FALSE);
@@ -1224,12 +1224,10 @@
 	if (!data)
 		return;
 	name = data->data;
-	if (data->next)
+	if (data->next) {
 		pass = data->next->data;
-
-	if (data->next)
 		g_snprintf(buf, sizeof(buf), "JOIN %s %s\r\n", name, pass);
-	else
+	} else
 		g_snprintf(buf, sizeof(buf), "JOIN %s\r\n", name);
 	irc_write(id->fd, buf, strlen(buf));
 }