From d4178292e5c6b64eb364bf8d4ca00c63cd62a57b Mon Sep 17 00:00:00 2001
From: Timo Sirainen <cras@irssi.org>
Date: Thu, 25 Oct 2001 12:02:10 +0000
Subject: [PATCH] Renamed /FORMAT whois_oper_type to whois_oper which is now
 removed. whois_oper wasn't really used anywhere AFAIK.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1919 dbcabf3a-b0e7-0310-adc4-f8d773084564
---
 src/fe-common/irc/fe-events-numeric.c | 8 ++++++--
 src/fe-common/irc/module-formats.c    | 3 +--
 src/fe-common/irc/module-formats.h    | 1 -
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 15501767..a39ff18d 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -360,14 +360,18 @@ static void event_whois_oper(IRC_SERVER_REC *server, const char *data)
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 3, NULL, &nick, &type);
+	/* type = "is an IRC Operator" */
 	if (strlen(type) > 5) {
 		type += 5;
 		if (*type == ' ') type++;
 	}
+	if (*type == '\0') {
+		/* shouldn't happen */
+		type = "IRC Operator";
+	}
 
 	printformat(server, nick, MSGLEVEL_CRAP,
-		    *type == '\0' ? IRCTXT_WHOIS_OPER :
-		    IRCTXT_WHOIS_OPER_TYPE, nick, type);
+		    IRCTXT_WHOIS_OPER, nick, type);
 	g_free(params);
 }
 
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 4fd20640..d3f39b72 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -100,8 +100,7 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "whois_idle", "{whois idle %|$1 days $2 hours $3 mins $4 secs}", 5, { 0, 1, 1, 1, 1 } },
 	{ "whois_idle_signon", "{whois idle %|$1 days $2 hours $3 mins $4 secs {comment signon: $5}}", 6, { 0, 1, 1, 1, 1, 0 } },
 	{ "whois_server", "{whois server %|$1 {comment $2}}", 3, { 0, 0, 0 } },
-	{ "whois_oper", "{whois  {hilight IRC operator}}", 1, { 0 } },
-	{ "whois_oper_type", "{whois  {hilight $1}}", 2, { 0, 0 } },
+	{ "whois_oper", "{whois  {hilight $1}}", 2, { 0, 0 } },
 	{ "whois_registered", "{whois  has registered this nick}", 1, { 0 } },
 	{ "whois_help", "{whois  is available for help}", 1, { 0 } },
 	{ "whois_modes", " {whois modes $1}", 2, { 0, 0 } },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index 6722ede1..4cdba2d3 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -76,7 +76,6 @@ enum {
 	IRCTXT_WHOIS_IDLE_SIGNON,
 	IRCTXT_WHOIS_SERVER,
 	IRCTXT_WHOIS_OPER,
-	IRCTXT_WHOIS_OPER_TYPE,
 	IRCTXT_WHOIS_REGISTERED,
 	IRCTXT_WHOIS_HELP,
 	IRCTXT_WHOIS_MODES,