# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 989442853 0
# Node ID 1b61db419774a95fbfe69b549cdd58c064fdfc33
# Parent  086213e7fb73c4ef56630d11699ef7d46ed84a6c
[gaim-migrate @ 1841]
hi rob! (just a few cleanups, irc passes -Wall :) )

committer: Tailor Script <tailor@pidgin.im>

diff -r 086213e7fb73 -r 1b61db419774 plugins/irc.c
--- a/plugins/irc.c	Wed May 09 19:58:14 2001 +0000
+++ b/plugins/irc.c	Wed May 09 21:14:13 2001 +0000
@@ -122,7 +122,6 @@
 	struct group *g;
 	struct buddy *b;
 	struct irc_channel *u;
-	gchar buf[IRC_BUF_LEN + 1];
 
 	if (idata->templist != NULL)
 		return;
@@ -469,7 +468,6 @@
 }
 static struct conversation *find_conversation_by_id(struct gaim_connection *gc, int id)
 {
-	struct irc_data *idata = (struct irc_data *)gc->proto_data;
 	GSList *bc = gc->buddy_chats;
 	struct conversation *b = NULL;
 
@@ -491,12 +489,10 @@
 
 static struct conversation *find_conversation_by_name(struct gaim_connection *gc, char *name)
 {
-	struct irc_data *idata = (struct irc_data *)gc->proto_data;
 	GSList *bc = gc->buddy_chats;
 	struct conversation *b = NULL;
 
 	while (bc) {
-		int x;
 		b = (struct conversation *)bc->data;
 
 		if (g_strcasecmp(name, b->name) == 0) {
@@ -745,13 +741,12 @@
 	}
 
 
-	if ((strstr(buf, " JOIN ")) && (buf[0] == ':') && (!strstr(buf, " NOTICE "))) {
+	if ((strstr(buf, " JOIN ")) && (strstr(buf, "!")) && (buf[0] == ':') && (!strstr(buf, " NOTICE "))) {
 
 		gchar u_channel[128];
 		gchar u_nick[128];
 
 		struct irc_channel *channel;
-		int id;
 		int j;
 
 		for (j = 0, i = 1; buf[i] != '!'; j++, i++) {
@@ -804,7 +799,7 @@
 		return;
 	}
 
-	if ((strstr(buf, " NICK ")) && (buf[0] == ':') && (!strstr(buf, " NOTICE "))) {
+	if ((strstr(buf, " NICK ")) && (strstr(buf, "!")) && (buf[0] == ':') && (!strstr(buf, " NOTICE "))) {
 
 		gchar old[128];
 		gchar new[128];
@@ -812,7 +807,6 @@
 		GList *templist;
 
 		struct irc_channel *channel;
-		int id;
 		int j;
 
 		for (j = 0, i = 1; buf[i] != '!'; j++, i++) {
@@ -844,7 +838,7 @@
 		}
 	}
 
-	if ((strstr(buf, "QUIT ")) && (buf[0] == ':') && (!strstr(buf, " NOTICE "))) {
+	if ((strstr(buf, "QUIT ")) && (buf[0] == ':') && (strstr(buf, "!")) && (!strstr(buf, " NOTICE "))) {
 
 		gchar u_nick[128];
 
@@ -873,15 +867,13 @@
 		}
 	}
 
-	if ((strstr(buf, " PART ")) && (buf[0] == ':') && (!strstr(buf, " NOTICE "))) {
+	if ((strstr(buf, " PART ")) && (strstr(buf, "!")) && (buf[0] == ':') && (!strstr(buf, " NOTICE "))) {
 
 		gchar u_channel[128];
 		gchar u_nick[128];
 
 		struct irc_channel *channel;
-		int id;
 		int j;
-		GList *test = NULL;
 
 		for (j = 0, i = 1; buf[i] != '!'; j++, i++) {
 			u_nick[j] = buf[i];
@@ -946,7 +938,6 @@
 		gchar u_channel[128];
 		gchar u_message[IRC_BUF_LEN];
 		int j;
-		int msgcode = 0;
 
 		for (j = 0, i = 1; buf[i] != '!'; j++, i++) {
 			u_nick[j] = buf[i];
@@ -1014,7 +1005,6 @@
 		gchar u_channel[128];
 		gchar u_message[IRC_BUF_LEN];
 		int j;
-		int msgcode = 0;
 
 		for (j = 0, i = 1; buf[i] != '!'; j++, i++) {
 			u_nick[j] = buf[i];
@@ -1228,9 +1218,6 @@
 
 	struct gaim_connection *gc = new_gaim_conn(user);
 	struct irc_data *idata = gc->proto_data = g_new0(struct irc_data, 1);
-	char c;
-	int i;
-	int status;
 
 	host = gethostbyname(user->proto_opt[0]);
 	if (!host) {
@@ -1364,7 +1351,7 @@
 	struct irc_data *idata = (struct irc_data *)gc->proto_data;
 	char buf[BUF_LEN];
 
-	if ((who[0] == '@') || (who[0] == '+') && (strlen(who)>1))
+	if (((who[0] == '@') || (who[0] == '+')) && (strlen(who)>1))
 		g_snprintf(buf, BUF_LEN, "WHOIS %s\n", who+1);
 	else
 		g_snprintf(buf, BUF_LEN, "WHOIS %s\n", who);
diff -r 086213e7fb73 -r 1b61db419774 src/gaim.h
--- a/src/gaim.h	Wed May 09 19:58:14 2001 +0000
+++ b/src/gaim.h	Wed May 09 21:14:13 2001 +0000
@@ -575,6 +575,7 @@
 extern void join_chat();
 extern void chat_write(struct conversation *, char *, int, char *, time_t);
 extern void add_chat_buddy(struct conversation *, char *);
+extern void rename_chat_buddy(struct conversation *, char *, char *);
 extern void remove_chat_buddy(struct conversation *, char *);
 extern void show_new_buddy_chat(struct conversation *);
 extern void setup_buddy_chats();