From eda9303ec90d1e69c2a6321f8405d95cf80f71c0 Mon Sep 17 00:00:00 2001
From: TingPing <tingping@tingping.se>
Date: Mon, 25 Mar 2013 19:17:44 -0400
Subject: Remove old CAPAB stuff

We already check for identify-msg elsewhere
---
 src/common/hexchat.h   | 1 -
 src/common/modes.c     | 6 ------
 src/common/proto-irc.c | 8 --------
 src/common/server.c    | 1 -
 4 files changed, 16 deletions(-)

(limited to 'src')

diff --git a/src/common/hexchat.h b/src/common/hexchat.h
index e234c976..f734472d 100644
--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@@ -572,7 +572,6 @@ typedef struct server
 	unsigned int have_namesx:1;		/* 005 tokens NAMESX and UHNAMES */
 	unsigned int have_uhnames:1;
 	unsigned int have_whox:1;		/* have undernet's WHOX features */
-	unsigned int have_capab:1;		/* supports CAPAB (005 tells us) */
 	unsigned int have_idmsg:1;		/* freenode's IDENTIFY-MSG */
 	unsigned int have_sasl:1;		/* SASL capability */
 	unsigned int have_except:1;	/* ban exemptions +e */
diff --git a/src/common/modes.c b/src/common/modes.c
index 7326b6fe..32b5a3fa 100644
--- a/src/common/modes.c
+++ b/src/common/modes.c
@@ -813,12 +813,6 @@ inbound_005 (server * serv, char *word[])
 		} else if (strcmp (word[w], "WHOX") == 0)
 		{
 			serv->have_whox = TRUE;
-		} else if (strcmp (word[w], "CAPAB") == 0)
-		{
-			serv->have_capab = TRUE;
-									/* 12345678901234567890 */
-			tcp_send_len (serv, "CAPAB IDENTIFY-MSG\r\n", 20);
-			/* now wait for numeric 290 */	
 		} else if (strcmp (word[w], "EXCEPTS") == 0)
 		{
 #ifndef WIN32
diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
index 13147016..790e3242 100644
--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@@ -518,14 +518,6 @@ process_numeric (session * sess, int n,
 		}
 		goto def;
 
-	case 290:	/* CAPAB reply */
-		if (strstr (word_eol[1], "IDENTIFY-MSG"))
-		{
-			serv->have_idmsg = TRUE;
-			break;
-		}
-		goto def;
-
 	case 301:
 		inbound_away (serv, word[4],
 						(word_eol[5][0] == ':') ? word_eol[5] + 1 : word_eol[5]);
diff --git a/src/common/server.c b/src/common/server.c
index 8ad1d6ca..1ace2a48 100644
--- a/src/common/server.c
+++ b/src/common/server.c
@@ -1886,7 +1886,6 @@ server_set_defaults (server *serv)
 	serv->have_namesx = FALSE;
 	serv->have_uhnames = FALSE;
 	serv->have_whox = FALSE;
-	serv->have_capab = FALSE;
 	serv->have_idmsg = FALSE;
 	serv->have_sasl = FALSE;
 	serv->have_except = FALSE;
-- 
cgit 1.4.1