From 37e02a3594fdddc3d5a3df0501c528f42db6c4da Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Tue, 23 Nov 2010 16:48:54 -0600
Subject: Added cs_entrymsg

---
 include/language.h   | 17 ++++++++++++-----
 include/regchannel.h |  2 --
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/language.h b/include/language.h
index ec3595060..0b183598b 100644
--- a/include/language.h
+++ b/include/language.h
@@ -343,8 +343,6 @@ enum LanguageString
 	CHAN_SUCCESSOR_UNSET,
 	CHAN_SUCCESSOR_IS_FOUNDER,
 	CHAN_DESC_CHANGED,
-	CHAN_ENTRY_MSG_CHANGED,
-	CHAN_ENTRY_MSG_UNSET,
 	CHAN_SET_BANTYPE_INVALID,
 	CHAN_SET_BANTYPE_CHANGED,
 	CHAN_SET_MLOCK_DEPRECATED,
@@ -524,7 +522,6 @@ enum LanguageString
 	CHAN_INFO_NO_FOUNDER,
 	CHAN_INFO_NO_SUCCESSOR,
 	CHAN_INFO_DESCRIPTION,
-	CHAN_INFO_ENTRYMSG,
 	CHAN_INFO_TIME_REGGED,
 	CHAN_INFO_LAST_USED,
 	CHAN_INFO_LAST_TOPIC,
@@ -597,6 +594,16 @@ enum LanguageString
 	CHAN_MODE_NOT_LOCKED,
 	CHAN_MODE_UNLOCKED,
 	CHAN_MODE_LIST_FMT,
+	CHAN_ENTRYMSG_LIST_HEADER,
+	CHAN_ENTRYMSG_LIST_ENTRY,
+	CHAN_ENTRYMSG_LIST_END,
+	CHAN_ENTRYMSG_LIST_EMPTY,
+	CHAN_ENTRYMSG_LIST_FULL,
+	CHAN_ENTRYMSG_ADDED,
+	CHAN_ENTRYMSG_DELETED,
+	CHAN_ENTRYMSG_NOT_FOUND,
+	CHAN_ENTRYMSG_CLEARED,
+	CHAN_ENTRYMSG_SYNTAX,
 	MEMO_HAVE_NEW_MEMO,
 	MEMO_HAVE_NEW_MEMOS,
 	MEMO_TYPE_READ_LAST,
@@ -1285,6 +1292,7 @@ enum LanguageString
 	CHAN_HELP_CMD_DEOP,
 	CHAN_HELP_CMD_CLONE,
 	CHAN_HELP_CMD_MODE,
+	CHAN_HELP_CMD_ENTRYMSG,
 	CHAN_HELP,
 	CHAN_HELP_EXPIRES,
 	CHAN_HELP_REGISTER,
@@ -1294,7 +1302,6 @@ enum LanguageString
 	CHAN_HELP_CMD_SET_FOUNDER,
 	CHAN_HELP_CMD_SET_SUCCESSOR,
 	CHAN_HELP_CMD_SET_DESC,
-	CHAN_HELP_CMD_SET_ENTRYMSG,
 	CHAN_HELP_CMD_SET_BANTYPE,
 	CHAN_HELP_CMD_SET_KEEPTOPIC,
 	CHAN_HELP_CMD_SET_OPNOTICE,
@@ -1314,7 +1321,6 @@ enum LanguageString
 	CHAN_HELP_SET_FOUNDER,
 	CHAN_HELP_SET_SUCCESSOR,
 	CHAN_HELP_SET_DESC,
-	CHAN_HELP_SET_ENTRYMSG,
 	CHAN_HELP_SET_BANTYPE,
 	CHAN_HELP_SET_KEEPTOPIC,
 	CHAN_HELP_SET_TOPICLOCK,
@@ -1360,6 +1366,7 @@ enum LanguageString
 	CHAN_HELP_GETKEY,
 	CHAN_HELP_CLONE,
 	CHAN_HELP_MODE,
+	CHAN_HELP_ENTRYMSG,
 	CHAN_SERVADMIN_HELP,
 	CHAN_SERVADMIN_HELP_DROP,
 	CHAN_SERVADMIN_HELP_SET_NOEXPIRE,
diff --git a/include/regchannel.h b/include/regchannel.h
index dd47a88fc..760a91f5f 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -116,8 +116,6 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
 	int16 bantype;
 	int16 *levels; /* Access levels for commands */
 
-	Anope::string entry_message; /* Notice sent on entering channel */
-
 	MemoInfo memos;
 
 	Channel *c; /* Pointer to channel record (if channel is currently in use) */
-- 
cgit