Move list-related isupport items to the list module itself.

diff --git a/modules/m_list.c b/modules/m_list.c
index 6574080654d9d71e45e3332abcff85e7769848cb..db48d8aec57710ca7251b3de680a3d900fb9a17b 100644 (file)
--- a/modules/m_list.c
+++ b/modules/m_list.c
@@ -42,6 +42,7 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_serv.h"
+#include "supported.h"
 #include "send.h"
 #include "msg.h"
 #include "parse.h"
@@ -83,12 +84,26 @@ static int _modinit(void)
 {
        iterate_clients_ev = rb_event_add("safelist_iterate_clients", safelist_iterate_clients, NULL, 3);
 
+       /* ELIST=[tokens]:
+        *
+        * M = mask search
+        * N = !mask search
+        * U = user count search (< >)
+        * C = creation time search (C> C<)
+        * T = topic search (T> T<)
+        */
+       add_isupport("SAFELIST", isupport_string, "");
+       add_isupport("ELIST", isupport_string, "CTU");
+
        return 0;
 }
 
 static void _moddeinit(void)
 {
        rb_event_delete(iterate_clients_ev);
+
+       delete_isupport("SAFELIST");
+       delete_isupport("ELIST");
 }
 
 static void safelist_check_cliexit(hook_data_client_exit * hdata)

diff --git a/src/supported.c b/src/supported.c
index 2bf4ba1674defd57e4bdde7fff582aee0f8e67ce..246ff511aea3bc9d7d93de0612af8367e2eff3f5 100644 (file)
--- a/src/supported.c
+++ b/src/supported.c
@@ -70,14 +70,6 @@
  *
  *  All unknown/unlisted modes are treated as type D.
  */
-/* ELIST=[tokens]:
- *
- * M = mask search
- * N = !mask search
- * U = user count search (< >)
- * C = creation time search (C> C<)
- * T = topic search (T> T<)
- */
 
 #include "stdinc.h"
 #include "client.h"
@@ -331,8 +323,6 @@ init_isupport(void)
        add_isupport("KNOCK", isupport_boolean, &ConfigChannel.use_knock);
        add_isupport("STATUSMSG", isupport_string, "@+");
        add_isupport("CALLERID", isupport_string, "g");
-       add_isupport("SAFELIST", isupport_string, "");
-       add_isupport("ELIST", isupport_string, "CTU");
        add_isupport("CASEMAPPING", isupport_string, "rfc1459");
        add_isupport("CHARSET", isupport_string, "ascii");
        add_isupport("NICKLEN", isupport_intptr, &nicklen);