stable now but there are GIANT PIECES MISSING

[citadel.git] / citadel / modules / imap / imap_store.c

diff --git a/citadel/modules/imap/imap_store.c b/citadel/modules/imap/imap_store.c
index 959e1235d783391abf8f6758fd872fccf82f55fb..429f8edbb980c8162eb9bd62b068f14e07c425e3 100644 (file)
--- a/citadel/modules/imap/imap_store.c
+++ b/citadel/modules/imap/imap_store.c
@@ -28,18 +28,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <ctype.h>
 #include <string.h>
@@ -53,6 +42,7 @@
 #include "config.h"
 #include "user_ops.h"
 #include "database.h"
+#include "room_ops.h"
 #include "msgbase.h"
 #include "internet_addressing.h"
 #include "serv_imap.h"
@@ -195,14 +185,8 @@ void imap_do_store(citimap_command *Cmd) {
        }
 
        free(ss_msglist);
-
-       /*
-        * The following two commands implement "instant expunge" if enabled.
-        */
-       if (config.c_instant_expunge) {
-               imap_do_expunge();
-               imap_rescan_msgids();
-       }
+       imap_do_expunge();              // Citadel always expunges immediately.
+       imap_rescan_msgids();
 }