# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1034720877 0
# Node ID da6e3c98498569f886a2bbf9180fb987341f20f0
# Parent  c1254110070a4062db6c0ea5af20bbc8e9bd0c55
[gaim-migrate @ 3841]
host mask on join thanks to birme (required change to the function)

committer: Tailor Script <tailor@pidgin.im>

diff -r c1254110070a -r da6e3c984985 src/buddy_chat.c
--- a/src/buddy_chat.c	Tue Oct 15 20:02:14 2002 +0000
+++ b/src/buddy_chat.c	Tue Oct 15 22:27:57 2002 +0000
@@ -913,7 +913,7 @@
         gtk_widget_show(list_item);
 }
 
-void add_chat_buddy(struct conversation *b, char *buddy)
+void add_chat_buddy(struct conversation *b, char *buddy, char *extra_msg)
 {
 	char *name = g_strdup(buddy);
 	char tmp[BUF_LONG];
@@ -933,7 +933,11 @@
 		play_sound(SND_CHAT_JOIN);
 
 	if (chat_options & OPT_CHAT_LOGON) {
-		g_snprintf(tmp, sizeof(tmp), _("%s entered the room."), name);
+		if (!extra_msg)
+			g_snprintf(tmp, sizeof(tmp), _("%s entered the room."), name);
+		else
+			g_snprintf(tmp, sizeof(tmp), _("%s [<I>%s</I>] entered the room."), name, 
+				   extra_msg);
 		write_to_conv(b, tmp, WFLAG_SYSTEM, NULL, time(NULL), -1);
 	}
 }
diff -r c1254110070a -r da6e3c984985 src/gaim.h
--- a/src/gaim.h	Tue Oct 15 20:02:14 2002 +0000
+++ b/src/gaim.h	Tue Oct 15 22:27:57 2002 +0000
@@ -363,7 +363,8 @@
 /* Functions in buddy_chat.c */
 extern void show_new_buddy_chat(struct conversation *);
 extern void chat_set_topic(struct conversation*, char*, char*);
-extern void add_chat_buddy(struct conversation *, char *);
+/*extern void add_chat_buddy(struct conversation *, char *);*/
+extern void add_chat_buddy(struct conversation *, char *, char *);
 extern void rename_chat_buddy(struct conversation *, char *, char *);
 extern void remove_chat_buddy(struct conversation *, char *, char *);
 
diff -r c1254110070a -r da6e3c984985 src/protocols/irc/irc.c
--- a/src/protocols/irc/irc.c	Tue Oct 15 20:02:14 2002 +0000
+++ b/src/protocols/irc/irc.c	Tue Oct 15 22:27:57 2002 +0000
@@ -76,18 +76,18 @@
 };
 
 struct irc_file_transfer {
-		enum { IFT_SENDFILE_IN, IFT_SENDFILE_OUT } type;
-		struct file_transfer *xfer;
-		char *sn;
-		char *name;
-		int len;
-		int watcher;
-		int awatcher;
-		char ip[12];
-		int port;
-		int fd;
-		int cur;
-		struct gaim_connection *gc;
+	enum { IFT_SENDFILE_IN, IFT_SENDFILE_OUT } type;
+	struct file_transfer *xfer;
+	char *sn;
+	char *name;
+	int len;
+	int watcher;
+	int awatcher;
+	char ip[12];
+	int port;
+	int fd;
+	int cur;
+	struct gaim_connection *gc;
 };
 
 GSList *dcc_chat_list = NULL;
@@ -253,38 +253,38 @@
 static char *int_to_col(int c)
 {
 	switch(c) {
-		case 1:
-			return "#ffffff";
-		case 2:
-			return "#000066";
-		case 3:
-			return "#006600";
-		case 4:
-			return "#ff0000";
-		case 5:
-			return "#660000";
-		case 6:
-			return "#660066";
-		case 7:
-			return "#666600";
-		case 8:
-			return "#cccc00";
-		case 9:
-			return "#33cc33";
-		case 10:
-			return "#00acac";
-		case 11:
-			return "#00ccac";
-		case 12:
-			return "#0000ff";
-		case 13:
-			return "#cc00cc";
-		case 14:
-			return "#666666";
-		case 15:
-			return "#00ccac";
-		default:
-			return "#000000";
+	case 1:
+		return "#ffffff";
+	case 2:
+		return "#000066";
+	case 3:
+		return "#006600";
+	case 4:
+		return "#ff0000";
+	case 5:
+		return "#660000";
+	case 6:
+		return "#660066";
+	case 7:
+		return "#666600";
+	case 8:
+		return "#cccc00";
+	case 9:
+		return "#33cc33";
+	case 10:
+		return "#00acac";
+	case 11:
+		return "#00ccac";
+	case 12:
+		return "#0000ff";
+	case 13:
+		return "#cc00cc";
+	case 14:
+		return "#666666";
+	case 15:
+		return "#00ccac";
+	default:
+		return "#000000";
 	}
 }
 
@@ -351,87 +351,87 @@
 	int fore, back;
 	while (*end) {
 		switch (*end) {
-			case 02: /* ^B */
-				*end = 0;
-				str = g_string_append(str, cur);
-				if (bold)
-					str = g_string_append(str, "</B>");
-				else
-					str = g_string_append(str, "<B>");
-				bold = !bold;
-				cur = end + 1;
-				break;
-			case 03: /* ^C */
-				*end++ = 0;
-				str = g_string_append(str, cur);
-				fore = back = -1;
+		case 02: /* ^B */
+			*end = 0;
+			str = g_string_append(str, cur);
+			if (bold)
+				str = g_string_append(str, "</B>");
+			else
+				str = g_string_append(str, "<B>");
+			bold = !bold;
+			cur = end + 1;
+			break;
+		case 03: /* ^C */
+			*end++ = 0;
+			str = g_string_append(str, cur);
+			fore = back = -1;
+			if (isdigit(*end)) {
+				fore = *end++ - '0';
 				if (isdigit(*end)) {
-					fore = *end++ - '0';
+					fore *= 10;
+					fore += *end++ - '0';
+				}
+				if (*end == ',' && isdigit(end[1])) {
+					end++;
+					back = *end++ - '0';
 					if (isdigit(*end)) {
-						fore *= 10;
-						fore += *end++ - '0';
-					}
-					if (*end == ',' && isdigit(end[1])) {
-						end++;
-						back = *end++ - '0';
-						if (isdigit(*end)) {
-							back *= 10;
-							back += *end++ - '0';
-						}
+						back *= 10;
+						back += *end++ - '0';
 					}
 				}
-				if (fore == -1) {
-					if (fg)
-						str = g_string_append(str, "</FONT>");
-					if (bg)
-						str = g_string_append(str, "</FONT>");
-					fg = bg = FALSE;
-				} else {
-					fore %= 16;
-					if (fg)
-						str = g_string_append(str, "</FONT>");
-					if (back != -1) {
-						if (bg)
-							str = g_string_append(str, "</FONT>");
-						back %= 16;
-						str = g_string_append(str, "<FONT BACK=");
-						str = g_string_append(str, int_to_col(back));
-						str = g_string_append_c(str, '>');
-						bg = TRUE;
-					}
-					str = g_string_append(str, "<FONT COLOR=");
-					str = g_string_append(str, int_to_col(fore));
-					str = g_string_append_c(str, '>');
-					fg = TRUE;
-				}
-				cur = end--;
-				break;
-			case 017: /* ^O */
-				if (!bold && !underline && !fg && !bg)
-					break;
-				*end = 0;
-				str = g_string_append(str, cur);
-				if (bold)
-					str = g_string_append(str, "</B>");
-				if (underline)
-					str = g_string_append(str, "</U>");
+			}
+			if (fore == -1) {
 				if (fg)
 					str = g_string_append(str, "</FONT>");
 				if (bg)
 					str = g_string_append(str, "</FONT>");
-				bold = underline = fg = bg = FALSE;
-				cur = end + 1;
+				fg = bg = FALSE;
+			} else {
+				fore %= 16;
+				if (fg)
+					str = g_string_append(str, "</FONT>");
+				if (back != -1) {
+					if (bg)
+						str = g_string_append(str, "</FONT>");
+					back %= 16;
+					str = g_string_append(str, "<FONT BACK=");
+					str = g_string_append(str, int_to_col(back));
+					str = g_string_append_c(str, '>');
+					bg = TRUE;
+				}
+				str = g_string_append(str, "<FONT COLOR=");
+				str = g_string_append(str, int_to_col(fore));
+				str = g_string_append_c(str, '>');
+				fg = TRUE;
+			}
+			cur = end--;
+			break;
+		case 017: /* ^O */
+			if (!bold && !underline && !fg && !bg)
 				break;
-			case 037: /* ^_ */
-				*end = 0;
-				str = g_string_append(str, cur);
-				if (underline)
-					str = g_string_append(str, "</U>");
-				else
-					str = g_string_append(str, "<U>");
-				underline = !underline;
-				cur = end + 1;
-				break;
+			*end = 0;
+			str = g_string_append(str, cur);
+			if (bold)
+				str = g_string_append(str, "</B>");
+			if (underline)
+				str = g_string_append(str, "</U>");
+			if (fg)
+				str = g_string_append(str, "</FONT>");
+			if (bg)
+				str = g_string_append(str, "</FONT>");
+			bold = underline = fg = bg = FALSE;
+			cur = end + 1;
+			break;
+		case 037: /* ^_ */
+			*end = 0;
+			str = g_string_append(str, cur);
+			if (underline)
+				str = g_string_append(str, "</U>");
+			else
+				str = g_string_append(str, "<U>");
+			underline = !underline;
+			cur = end + 1;
+			break;
 		}
 		end++;
 	}
@@ -488,46 +488,46 @@
 static void irc_file_transfer_do(struct gaim_connection *gc, struct irc_file_transfer *ift) {
 	/* Ok, we better be receiving some crap here boyeee */
 	if (transfer_in_do(ift->xfer, ift->fd, ift->name, ift->len)) {
-			gaim_input_remove(ift->watcher);
-			ift->watcher = 0;
+		gaim_input_remove(ift->watcher);
+		ift->watcher = 0;
 	}
 }
 
 
 void irc_read_dcc_ack (gpointer data, gint source, GaimInputCondition condition) {
-		/* Read ACK Here */
+	/* Read ACK Here */
 
 }
 
 void dcc_send_callback (gpointer data, gint source, GaimInputCondition condition) {
-		struct irc_file_transfer *ift = data;
-		struct sockaddr_in addr;
-		int len = sizeof(addr);
+	struct irc_file_transfer *ift = data;
+	struct sockaddr_in addr;
+	int len = sizeof(addr);
 		
-		addr.sin_family = AF_INET;
-		addr.sin_port = htons(ift->port);
-		addr.sin_addr.s_addr = INADDR_ANY;
+	addr.sin_family = AF_INET;
+	addr.sin_port = htons(ift->port);
+	addr.sin_addr.s_addr = INADDR_ANY;
 
-		ift->fd = accept(ift->fd, (struct sockaddr *)&addr, &len);
-		if (!ift->fd) {
-				/* FIXME: Handle this gracefully XXX */
-				printf("Something bad happened here, bubba!\n");
-				return;
-		}
+	ift->fd = accept(ift->fd, (struct sockaddr *)&addr, &len);
+	if (!ift->fd) {
+		/* FIXME: Handle this gracefully XXX */
+		printf("Something bad happened here, bubba!\n");
+		return;
+	}
 		
 	/*	ift->awatcher = gaim_input_add(ift->fd, GAIM_INPUT_READ, irc_read_dcc_ack, ift); */
 		
-		if (transfer_out_do(ift->xfer, ift->fd, 0)) {
-				gaim_input_remove(ift->watcher);
-				ift->watcher = 0;
-		}
+	if (transfer_out_do(ift->xfer, ift->fd, 0)) {
+		gaim_input_remove(ift->watcher);
+		ift->watcher = 0;
+	}
 }
 
 void dcc_recv_callback (gpointer data, gint source, GaimInputCondition condition) {
-		struct irc_file_transfer *ift = data;
-
-		ift->fd = source;
-		irc_file_transfer_do(ift->gc, ift);
+	struct irc_file_transfer *ift = data;
+	
+	ift->fd = source;
+	irc_file_transfer_do(ift->gc, ift);
 }
 
 void dcc_chat_callback (gpointer data, gint source, GaimInputCondition condition) {
@@ -631,7 +631,7 @@
 	if (*names == ':') names++;
 	buf = g_strsplit(names, " ", -1);
 	for (tmp = buf; *tmp; tmp++)
-		add_chat_buddy(c, *tmp);
+		add_chat_buddy(c, *tmp, NULL);
 	g_strfreev(buf);
 }
 
@@ -660,7 +660,7 @@
 		char buf[IRC_BUF_LEN];
 		chat_set_topic(c, NULL, po);
 		g_snprintf(buf, sizeof(buf), _("<B>%s has changed the topic to: %s</B>"),
-				text, po);
+			   text, po);
 		write_to_conv(c, buf, WFLAG_SYSTEM, NULL, time(NULL), -1);
 	}
 }
@@ -747,7 +747,7 @@
 			}
 			tmp = g_strdup(r->data);
 			g_snprintf(buf, sizeof(buf), "%s%s%s", op ? "@" : "",
-					voice ? "+" : "", nick);
+				   voice ? "+" : "", nick);
 			rename_chat_buddy(c, tmp, buf);
 			g_free(tmp);
 			return;
@@ -990,8 +990,8 @@
 		handle_version(gc, word, word_eol, n);
 		break;
 	case 352: /* RPL_WHOREPLY */
-	       handle_who(gc, word, word_eol, n);
-	       break;
+		handle_who(gc, word, word_eol, n);
+		break;
 	case 353: /* RPL_NAMREPLY */
 		handle_names(gc, word[5], word_eol[6]);
 		break;
@@ -1152,7 +1152,7 @@
 
 	if (!g_strncasecmp(msg, "VERSION", 7)) {
 		g_snprintf(buf, sizeof(buf), "NOTICE %s :\001VERSION Gaim " VERSION ": The Penguin Pimpin' "
-					     "Multi-protocol Messaging Client: " WEBSITE "\001\r\n", nick);
+			   "Multi-protocol Messaging Client: " WEBSITE "\001\r\n", nick);
 		irc_write(id->fd, buf, strlen(buf));
 	}
 	if (!g_strncasecmp(msg, "CLIENTINFO", 10)) {
@@ -1187,22 +1187,22 @@
 
 
 	if (!g_strncasecmp(msg, "DCC SEND", 8)) {
-			struct irc_file_transfer *ift = g_new0(struct irc_file_transfer, 1);
-			char **send_args = g_strsplit(msg, " ", 6);
-			send_args[5][strlen(send_args[5])-1] = 0;
+		struct irc_file_transfer *ift = g_new0(struct irc_file_transfer, 1);
+		char **send_args = g_strsplit(msg, " ", 6);
+		send_args[5][strlen(send_args[5])-1] = 0;
 
-			ift->type = IFT_SENDFILE_IN;
-			ift->sn = g_strdup(nick);
-			ift->gc = gc;
-			g_snprintf(ift->ip, sizeof(ift->ip), send_args[3]);	
-			ift->port = atoi(send_args[4]);
-			ift->len = atoi(send_args[5]);
-			ift->name = g_strdup(send_args[2]);
-			ift->cur = 0;
+		ift->type = IFT_SENDFILE_IN;
+		ift->sn = g_strdup(nick);
+		ift->gc = gc;
+		g_snprintf(ift->ip, sizeof(ift->ip), send_args[3]);	
+		ift->port = atoi(send_args[4]);
+		ift->len = atoi(send_args[5]);
+		ift->name = g_strdup(send_args[2]);
+		ift->cur = 0;
 
-			id->file_transfers = g_slist_append(id->file_transfers, ift);
+		id->file_transfers = g_slist_append(id->file_transfers, ift);
 
-			ift->xfer = transfer_in_add(gc, nick, ift->name, ift->len, 1, NULL);
+		ift->xfer = transfer_in_add(gc, nick, ift->name, ift->len, 1, NULL);
 	}
 	
 	/* XXX should probably write_to_conv or something here */
@@ -1286,9 +1286,20 @@
 			serv_got_joined_chat(gc, id++, chan);
 		} else {
 			struct conversation *c = irc_find_chat(gc, chan);
-			if (c)
-				add_chat_buddy(c, nick);
+			if (c) {
+				char *hostmask = g_strdup(word[1]);
+				char *p = strchr(hostmask, '!');
+				if (p) {
+					char *pend = strchr(p, ' ');
+					if (pend) {
+						*pend = 0;
+					}
+					add_chat_buddy(c, nick, p+1);
+					g_free(hostmask);
+				}
+			}
 		}
+
 	} else if (!strcmp(cmd, "KICK")) {
 		if (!strcmp(gc->displayname, word[4])) {
 			struct conversation *c = irc_find_chat(gc, word[3]);
@@ -1296,11 +1307,6 @@
 				return FALSE;
 			gc->buddy_chats = g_slist_remove(gc->buddy_chats, c);
 			c->gc = NULL;
-			/*
-			g_snprintf(outbuf, sizeof(outbuf), _("You have been kicked from %s by %s:"),
-				   word[3], nick);
-			do_error_dialog(outbuf, *word_eol[5] == ':' ? word_eol[5] + 1 : word_eol[5], GAIM_INFO);
-			*/
 			g_snprintf(outbuf, sizeof(outbuf), _("You have been kicked from %s: %s"),
 				   word[3], *word_eol[5] == ':' ? word_eol[5] + 1 : word_eol[5]);
 			do_error_dialog(outbuf, _("IRC Error"), GAIM_ERROR);
@@ -1397,7 +1403,7 @@
 			char buf[IRC_BUF_LEN];
 			chat_set_topic(c, nick, topic);
 			g_snprintf(buf, sizeof(buf), _("<B>%s has changed the topic to: %s</B>"),
-					nick, topic);
+				   nick, topic);
 			write_to_conv(c, buf, WFLAG_SYSTEM, NULL, time(NULL), -1);
 		}
 	} else if (!strcmp(cmd, "WALLOPS")) { /* Don't know if a dialog box is the right way? */
@@ -1445,6 +1451,9 @@
 		g_strchomp(d);
 		debug_printf("IRC S: %s\n", d);
 
+		/* REMOVE ME BEFORE SUBMIT! */
+		/* fprintf(stderr, "IRC S: %s\n", d); */
+
 		idata->rxlen -= len;
 		if (idata->rxlen) {
 			char *tmp = g_strdup(e + 1);
@@ -1565,15 +1574,15 @@
 
 	/* Kill any existing transfers */
 	while (idata->file_transfers) {
-			struct irc_file_transfer *ift = (struct irc_file_transfer *)idata->file_transfers->data;
+		struct irc_file_transfer *ift = (struct irc_file_transfer *)idata->file_transfers->data;
 
-			g_free(ift->sn);
-			g_free(ift->name);
-			gaim_input_remove(ift->watcher);
+		g_free(ift->sn);
+		g_free(ift->name);
+		gaim_input_remove(ift->watcher);
 
-			close(ift->fd);
+		close(ift->fd);
 
-			idata->file_transfers = idata->file_transfers->next;
+		idata->file_transfers = idata->file_transfers->next;
 	}
 	idata->file_transfers = NULL;
 
@@ -1601,7 +1610,7 @@
 }
 
 static void set_mode_3(struct gaim_connection *gc, char *who, int sign, int mode,
-			int start, int end, char *word[])
+		       int start, int end, char *word[])
 {
 	struct irc_data *id = gc->proto_data;
 	char buf[IRC_BUF_LEN];
@@ -1611,24 +1620,24 @@
 	while (1) {
 		left = end - i;
 		switch (left) {
-			case 0:
-				return;
-			case 1:
-				g_snprintf(buf, sizeof(buf), "MODE %s %c%c %s\r\n",
-						who, sign, mode, word[i]);
-				i += 1;
-				break;
-			case 2:
-				g_snprintf(buf, sizeof(buf), "MODE %s %c%c%c %s %s\r\n",
-						who, sign, mode, mode, word[i], word[i + 1]);
-				i += 2;
-				break;
-			default:
-				g_snprintf(buf, sizeof(buf), "MODE %s %c%c%c%c %s %s %s\r\n",
-						who, sign, mode, mode, mode,
-						word[i], word[i + 1], word[i + 2]);
-				i += 2;
-				break;
+		case 0:
+			return;
+		case 1:
+			g_snprintf(buf, sizeof(buf), "MODE %s %c%c %s\r\n",
+				   who, sign, mode, word[i]);
+			i += 1;
+			break;
+		case 2:
+			g_snprintf(buf, sizeof(buf), "MODE %s %c%c%c %s %s\r\n",
+				   who, sign, mode, mode, word[i], word[i + 1]);
+			i += 2;
+			break;
+		default:
+			g_snprintf(buf, sizeof(buf), "MODE %s %c%c%c%c %s %s %s\r\n",
+				   who, sign, mode, mode, mode,
+				   word[i], word[i + 1], word[i + 2]);
+			i += 2;
+			break;
 		}
 		irc_write(id->fd, buf, strlen(buf));
 		if (left < 3)
@@ -1637,7 +1646,7 @@
 }
 
 static void set_mode_6(struct gaim_connection *gc, char *who, int sign, int mode,
-			int start, int end, char *word[])
+		       int start, int end, char *word[])
 {
 	struct irc_data *id = gc->proto_data;
 	char buf[IRC_BUF_LEN];
@@ -1647,44 +1656,44 @@
 	while (1) {
 		left = end - i;
 		switch (left) {
-			case 0:
-				return;
-			case 1:
-				g_snprintf(buf, sizeof(buf), "MODE %s %c%c %s\r\n",
-						who, sign, mode, word[i]);
-				i += 1;
-				break;
-			case 2:
-				g_snprintf(buf, sizeof(buf), "MODE %s %c%c%c %s %s\r\n",
-						who, sign, mode, mode, word[i], word[i + 1]);
-				i += 2;
-				break;
-			case 3:
-				g_snprintf(buf, sizeof(buf), "MODE %s %c%c%c%c %s %s %s\r\n",
-						who, sign, mode, mode, mode,
-						word[i], word[i + 1], word[i + 2]);
-				i += 3;
-				break;
-			case 4:
-				g_snprintf(buf, sizeof(buf), "MODE %s %c%c%c%c%c %s %s %s %s\r\n",
-						who, sign, mode, mode, mode, mode,
-						word[i], word[i + 1], word[i + 2], word[i + 3]);
-				i += 4;
-				break;
-			case 5:
-				g_snprintf(buf, sizeof(buf), "MODE %s %c%c%c%c%c%c %s %s %s %s %s\r\n",
-						who, sign, mode, mode, mode, mode, mode,
-						word[i], word[i + 1], word[i + 2],
-						word[i + 3], word[i + 4]);
-				i += 5;
-				break;
-			default:
-				g_snprintf(buf, sizeof(buf), "MODE %s %c%c%c%c%c%c%c %s %s %s %s %s %s\r\n",
-						who, sign, mode, mode, mode, mode, mode, mode,
-						word[i], word[i + 1], word[i + 2],
-						word[i + 3], word[i + 4], word[i + 5]);
-				i += 6;
-				break;
+		case 0:
+			return;
+		case 1:
+			g_snprintf(buf, sizeof(buf), "MODE %s %c%c %s\r\n",
+				   who, sign, mode, word[i]);
+			i += 1;
+			break;
+		case 2:
+			g_snprintf(buf, sizeof(buf), "MODE %s %c%c%c %s %s\r\n",
+				   who, sign, mode, mode, word[i], word[i + 1]);
+			i += 2;
+			break;
+		case 3:
+			g_snprintf(buf, sizeof(buf), "MODE %s %c%c%c%c %s %s %s\r\n",
+				   who, sign, mode, mode, mode,
+				   word[i], word[i + 1], word[i + 2]);
+			i += 3;
+			break;
+		case 4:
+			g_snprintf(buf, sizeof(buf), "MODE %s %c%c%c%c%c %s %s %s %s\r\n",
+				   who, sign, mode, mode, mode, mode,
+				   word[i], word[i + 1], word[i + 2], word[i + 3]);
+			i += 4;
+			break;
+		case 5:
+			g_snprintf(buf, sizeof(buf), "MODE %s %c%c%c%c%c%c %s %s %s %s %s\r\n",
+				   who, sign, mode, mode, mode, mode, mode,
+				   word[i], word[i + 1], word[i + 2],
+				   word[i + 3], word[i + 4]);
+			i += 5;
+			break;
+		default:
+			g_snprintf(buf, sizeof(buf), "MODE %s %c%c%c%c%c%c%c %s %s %s %s %s %s\r\n",
+				   who, sign, mode, mode, mode, mode, mode, mode,
+				   word[i], word[i + 1], word[i + 2],
+				   word[i + 3], word[i + 4], word[i + 5]);
+			i += 6;
+			break;
 		}
 		irc_write(id->fd, buf, strlen(buf));
 		if (left < 6)
@@ -1863,8 +1872,8 @@
 		}
 		c = irc_find_chat(gc, chan);
 		g_snprintf(buf, sizeof(buf), "PART %s%s%s\r\n", chan,
-				*reason ? " :" : "",
-				*reason ? reason : "");
+			   *reason ? " :" : "",
+			   *reason ? reason : "");
 		irc_write(id->fd, buf, strlen(buf));
 		if (c) {
 			gc->buddy_chats = g_slist_remove(gc->buddy_chats, c);
@@ -2154,39 +2163,39 @@
 }
 #if 0
 static void irc_ask_send_file(struct gaim_connection *gc, char *destsn) {
-		struct irc_data *id = (struct irc_data *)gc->proto_data;
-		struct irc_file_transfer *ift = g_new0(struct irc_file_transfer, 1);
-		char *localip = (char *)malloc(12);
+	struct irc_data *id = (struct irc_data *)gc->proto_data;
+	struct irc_file_transfer *ift = g_new0(struct irc_file_transfer, 1);
+	char *localip = (char *)malloc(12);
 
-		if (getlocalip(localip) == -1) {
-				free(localip);
-				return;
-		} 
+	if (getlocalip(localip) == -1) {
+		free(localip);
+		return;
+	} 
 
-		ift->type = IFT_SENDFILE_OUT;
-		ift->sn = g_strdup(destsn);
-		ift->gc = gc;
-		snprintf(ift->ip, sizeof(ift->ip), "%s", localip);
-		id->file_transfers = g_slist_append(id->file_transfers, ift);
+	ift->type = IFT_SENDFILE_OUT;
+	ift->sn = g_strdup(destsn);
+	ift->gc = gc;
+	snprintf(ift->ip, sizeof(ift->ip), "%s", localip);
+	id->file_transfers = g_slist_append(id->file_transfers, ift);
 
-		ift->xfer = transfer_out_add(gc, ift->sn);
+	ift->xfer = transfer_out_add(gc, ift->sn);
 }
 #endif
 static struct irc_file_transfer *find_ift_by_xfer(struct gaim_connection *gc, 
-				struct file_transfer *xfer) {
+						  struct file_transfer *xfer) {
 		
-		GSList *g = ((struct irc_data *)gc->proto_data)->file_transfers;
-		struct irc_file_transfer *f = NULL;
+	GSList *g = ((struct irc_data *)gc->proto_data)->file_transfers;
+	struct irc_file_transfer *f = NULL;
 
-		while (g) {
-				f = (struct irc_file_transfer *)g->data;
-				if (f->xfer == xfer)
-						break;
-				g = g->next;
-				f = NULL;
-		}
+	while (g) {
+		f = (struct irc_file_transfer *)g->data;
+		if (f->xfer == xfer)
+			break;
+		g = g->next;
+		f = NULL;
+	}
 
-		return f;
+	return f;
 }
 
 static void irc_file_transfer_data_chunk(struct gaim_connection *gc, struct file_transfer *xfer, const char *data, int len) {
@@ -2270,7 +2279,7 @@
 }
 
 static void irc_file_transfer_in(struct gaim_connection *gc,
-				struct file_transfer *xfer, int offset) {
+				 struct file_transfer *xfer, int offset) {
 
 	struct irc_file_transfer *ift = find_ift_by_xfer(gc, xfer);
 
@@ -2311,8 +2320,8 @@
 	chat->gc = gc;
 	g_snprintf (chat->nick, sizeof (chat->nick), "%s", who);
 	if (chat->fd < 0)  {
-		  dcc_chat_cancel (NULL,chat);
-		  return;
+		dcc_chat_cancel (NULL,chat);
+		return;
 	}
 	addr.sin_family = AF_INET;
 	addr.sin_port = 0;
@@ -2325,9 +2334,9 @@
 	getlocalip(chat->ip_address);
 	chat->inpa =
 		gaim_input_add (chat->fd, GAIM_INPUT_READ, dcc_chat_connected,
-			       chat);
+				chat);
 	g_snprintf (buf, sizeof buf, "\001DCC CHAT chat %s %d\001\n",
-		  chat->ip_address, chat->port);
+		    chat->ip_address, chat->port);
 	irc_send_im (gc, who, buf, -1, 0);
 }
 
@@ -2361,13 +2370,13 @@
 	pbm->callback = irc_start_chat;
 	pbm->gc = gc;
 	m = g_list_append(m, pbm);
-/*
-	pbm = g_new0(struct proto_buddy_menu, 1);
-	pbm->label = _("DCC Send");
-	pbm->callback = irc_ask_send_file;
-	pbm->gc = gc;
-	m = g_list_append(m, pbm);
-*/
+	/*
+	  pbm = g_new0(struct proto_buddy_menu, 1);
+	  pbm->label = _("DCC Send");
+	  pbm->callback = irc_ask_send_file;
+	  pbm->gc = gc;
+	  m = g_list_append(m, pbm);
+	*/
 	
 	pbm = g_new0(struct proto_buddy_menu, 1);
 	pbm->label = _("CTCP ClientInfo");
diff -r c1254110070a -r da6e3c984985 src/protocols/jabber/jabber.c
--- a/src/protocols/jabber/jabber.c	Tue Oct 15 20:02:14 2002 +0000
+++ b/src/protocols/jabber/jabber.c	Tue Oct 15 22:27:57 2002 +0000
@@ -1408,7 +1408,7 @@
 		if (p->from->resource) {
 			if (!y) {
 				if (!find_chat_buddy(jc->b, p->from->resource)) {
-					add_chat_buddy(jc->b, p->from->resource);
+					add_chat_buddy(jc->b, p->from->resource, NULL);
 				} else if ((y = xmlnode_get_tag(p->x, "status"))) {
 					jabber_track_away(gjc, p, NULL);
 				}
@@ -1569,7 +1569,7 @@
 					return;
 				}
 				if (!find_chat_buddy(jc->b, gjid->resource)) {
-					add_chat_buddy(jc->b, gjid->resource);
+					add_chat_buddy(jc->b, gjid->resource, NULL);
 				}
 			}
 		}
diff -r c1254110070a -r da6e3c984985 src/protocols/msn/msn.c
--- a/src/protocols/msn/msn.c	Tue Oct 15 20:02:14 2002 +0000
+++ b/src/protocols/msn/msn.c	Tue Oct 15 22:27:57 2002 +0000
@@ -494,7 +494,7 @@
 	if (!g_strncasecmp(buf, "ACK", 3)) {
 	} else if (!g_strncasecmp(buf, "ANS", 3)) {
 		if (ms->chat)
-			add_chat_buddy(ms->chat, gc->username);
+			add_chat_buddy(ms->chat, gc->username, NULL);
 	} else if (!g_strncasecmp(buf, "BYE", 3)) {
 		if (ms->chat) {
 			char *user, *tmp = buf;
@@ -521,7 +521,7 @@
 		if (ms->total > 1) {
 			if (!ms->chat)
 				ms->chat = serv_got_joined_chat(gc, ++id, "MSN Chat");
-			add_chat_buddy(ms->chat, user);
+			add_chat_buddy(ms->chat, user, NULL);
 		} 
 	} else if (!g_strncasecmp(buf, "JOI", 3)) {
 		char *user, *tmp = buf;
@@ -531,13 +531,13 @@
 
 		if (ms->total == 1) {
 			ms->chat = serv_got_joined_chat(gc, ++id, "MSN Chat");
-			add_chat_buddy(ms->chat, ms->user);
-			add_chat_buddy(ms->chat, gc->username);
+			add_chat_buddy(ms->chat, ms->user, NULL);
+			add_chat_buddy(ms->chat, gc->username, NULL);
 			g_free(ms->user);
 			ms->user = NULL;
 		}
 		if (ms->chat)
-			add_chat_buddy(ms->chat, user);
+			add_chat_buddy(ms->chat, user, NULL);
 		ms->total++;
 		while (ms->txqueue) {
 			char *send = add_cr(ms->txqueue->data);
diff -r c1254110070a -r da6e3c984985 src/protocols/napster/napster.c
--- a/src/protocols/napster/napster.c	Tue Oct 15 20:02:14 2002 +0000
+++ b/src/protocols/napster/napster.c	Tue Oct 15 22:27:57 2002 +0000
@@ -263,7 +263,7 @@
 		channel = find_channel_by_name(gc, res[0]);
 		convo = find_conversation_by_id(gc, channel->id);
 
-		add_chat_buddy(convo, res[1]);
+		add_chat_buddy(convo, res[1], NULL);
 
 		g_strfreev(res);
 
diff -r c1254110070a -r da6e3c984985 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Tue Oct 15 20:02:14 2002 +0000
+++ b/src/protocols/oscar/oscar.c	Tue Oct 15 22:27:57 2002 +0000
@@ -2751,7 +2751,7 @@
 		return 1;
 
 	for (i = 0; i < count; i++)
-		add_chat_buddy(c->cnv, info[i].sn);
+		add_chat_buddy(c->cnv, info[i].sn, NULL);
 
 	return 1;
 }
diff -r c1254110070a -r da6e3c984985 src/protocols/toc/toc.c
--- a/src/protocols/toc/toc.c	Tue Oct 15 20:02:14 2002 +0000
+++ b/src/protocols/toc/toc.c	Tue Oct 15 22:27:57 2002 +0000
@@ -766,7 +766,7 @@
 
 		if (in && (*in == 'T'))
 			while ((buddy = strtok(NULL, ":")) != NULL)
-				add_chat_buddy(b, buddy);
+				add_chat_buddy(b, buddy, NULL);
 		else
 			while ((buddy = strtok(NULL, ":")) != NULL)
 				remove_chat_buddy(b, buddy, NULL);