Continue phase 2 of modules stuff.

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 97397b52b7511c6ce7487678712dc7e3ad10085e..51bf426f110b89a4c22bc57ebe3831317c2cdf8e 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -49,16 +49,12 @@
 #include "html.h"
 #include "genstamp.h"
 #include "internet_addressing.h"
-#include "serv_fulltext.h"
+#include "serv_fulltext.h"     /* Needed for ft_search and ft_index_message */
 #include "vcard.h"
 #include "euidindex.h"
 #include "journaling.h"
 #include "citadel_dirs.h"
-#include "serv_network.h"
 
-#ifdef HAVE_LIBSIEVE
-# include "serv_sieve.h"
-#endif /* HAVE_LIBSIEVE */
 
 long config_msgnum;
 struct addresses_to_be_filed *atbf = NULL;
@@ -2143,15 +2139,8 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms
                lprintf(CTDL_DEBUG, "CtdlSaveMsgPointerInRoom() skips repl checks\n");
        }
 
-       /* Submit this room for net processing */
-       network_queue_room(&CC->room, NULL);
-
-#ifdef HAVE_LIBSIEVE
-       /* If this is someone's inbox, submit the room for sieve processing */
-       if (!strcasecmp(&CC->room.QRname[11], MAILROOM)) {
-               sieve_queue_room(&CC->room);
-       }
-#endif /* HAVE_LIBSIEVE */
+       /* Submit this room for processing by hooks */
+       PerformRoomHooks(&CC->room);
 
        /* Go back to the room we were in before we wandered here... */
        getroom(&CC->room, hold_rm);