* moved "instant expunge" to imap_do_store() so that it gets called from

  both STORE and UID STORE commands.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index adf3f9e4872b50bae4953240d2218e23b7df8131..239bd95de0b6725e1333ee96b513783e9c6e9ab8 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 654.9  2005/08/10 21:10:54  ajc
+* moved "instant expunge" to imap_do_store() so that it gets called from
+  both STORE and UID STORE commands.
+
 Revision 654.8  2005/08/10 15:39:35  ajc
 * Experimental "instant expunge" option.  For now, you have to put
   -DINSTANT_EXPUNGE into the CFLAGS line of your Makefile.  If we decide to
@@ -7021,4 +7025,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/imap_store.c b/citadel/imap_store.c
index 31a14e1f07f5ad8b2fa1c346f4cbec8e92371f99..0c40e430d6c915f7897295a2d726d23986ef1e5b 100644 (file)
--- a/citadel/imap_store.c
+++ b/citadel/imap_store.c
@@ -162,6 +162,16 @@ void imap_do_store(int num_items, char **itemlist) {
                        }
                }
        }
+
+#ifdef INSTANT_EXPUNGE
+       /*
+        * The following two commands implement "instant expunge"
+        * which is experimental.
+        */
+       imap_do_expunge();
+       imap_rescan_msgids();
+#endif /* INSTANT_EXPUNGE */
+
 }
 
 
@@ -200,16 +210,6 @@ void imap_store(int num_parms, char *parms[]) {
        }
 
        imap_do_store(num_items, itemlist);
-
-#ifdef INSTANT_EXPUNGE
-       /*
-        * The following two commands implement "instant expunge"
-        * which is experimental.
-        */
-       imap_do_expunge();
-       imap_rescan_msgids();
-#endif /* INSTANT_EXPUNGE */
-
        cprintf("%s OK STORE completed\r\n", parms[0]);
 }
 

diff --git a/citadel/serv_imap.h b/citadel/serv_imap.h
index ddd28a717961c0f01b079f78fb7baaf6c0856b78..3fd11be9eda27aebb0829b89928baaa7e591d97d 100644 (file)
--- a/citadel/serv_imap.h
+++ b/citadel/serv_imap.h
@@ -8,6 +8,7 @@ void imap_command_loop(void);
 int imap_grabroom(char *returned_roomname, char *foldername, int zapped_ok);
 void imap_free_transmitted_message(void);
 int imap_do_expunge(void);
+void imap_rescan_msgids(void);
 
 
 struct citimap {