modules: add origin field to V2

[solanum.git] / extensions / m_remove.c

diff --git a/extensions/m_remove.c b/extensions/m_remove.c
index 25bbd4700b85a0332ea64ba21777b36b85aa3a6e..4d6e74d7c2344a8aca6bd6efa96ce6c03051190f 100644 (file)
--- a/extensions/m_remove.c
+++ b/extensions/m_remove.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_kick.c 3317 2007-03-28 23:17:06Z jilles $
  */
 
 #include "stdinc.h"
@@ -57,22 +55,14 @@ mapi_hfn_list_av1 remove_hfnlist[] = {
        { "privmsg_channel", (hookfn) remove_quote_part },
        { NULL, NULL }
 };
+mapi_cap_list_av2 remove_cap_list[] = {
+       { MAPI_CAP_SERVER, "REMOVE", NULL, &CAP_REMOVE },
+       { 0, NULL, NULL, NULL }
+};
 
-static int
-modinit(void)
-{
-       CAP_REMOVE = capability_put(serv_capindex, "REMOVE");
-
-       return 0;
-}
-
-static void
-moddeinit(void)
-{
-       capability_orphan(serv_capindex, "REMOVE");
-}
+const char description[] = "Provides the REMOVE command, an alternative to KICK";
 
-DECLARE_MODULE_AV1(remove, modinit, moddeinit, remove_clist, NULL, remove_hfnlist, "$Revision: 3317 $");
+DECLARE_MODULE_AV2(remove, MAPI_ORIGIN_EXTENSION, NULL, NULL, remove_clist, NULL, remove_hfnlist, remove_cap_list, NULL, description);
 
 static int
 m_remove(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])