From 0552599327f680bea4b6a78baa6b022252c6b04e Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 10 Aug 2005 21:10:54 +0000 Subject: [PATCH] * moved "instant expunge" to imap_do_store() so that it gets called from both STORE and UID STORE commands. --- citadel/ChangeLog | 5 ++++- citadel/imap_store.c | 20 ++++++++++---------- citadel/serv_imap.h | 1 + 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index adf3f9e48..239bd95de 100644 --- 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 Fri Jul 10 1998 Art Cancro * Initial CVS import - diff --git a/citadel/imap_store.c b/citadel/imap_store.c index 31a14e1f0..0c40e430d 100644 --- 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 ddd28a717..3fd11be9e 100644 --- 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 { -- 2.39.2