isync

commit f1eea7d9a50da1a4e52ca22edabb5d31291e03be
parent 48754ecc74123d4405999e3e5e720779d7a10bd2
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date:   Sat, 16 Nov 2013 17:59:45 +0100

do not trash expired messages

we are not actually deleting them, so there is no point in saving them
in the trash.

Diffstat:
M
src/sync.c
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sync.c b/src/sync.c
@@ -1628,7 +1628,7 @@ msgs_flags_set( sync_vars_t *svars, int t )
 	    (svars->ctx[t]->conf->trash || (svars->ctx[1-t]->conf->trash && svars->ctx[1-t]->conf->trash_remote_new))) {
 		debug( "trashing in %s\n", str_ms[t] );
 		for (tmsg = svars->ctx[t]->msgs; tmsg; tmsg = tmsg->next)
-			if (tmsg->flags & F_DELETED) {
+			if ((tmsg->flags & F_DELETED) && (t == M || !tmsg->srec || !(tmsg->srec->status & (S_EXPIRE|S_EXPIRED)))) {
 				if (svars->ctx[t]->conf->trash) {
 					if (!svars->ctx[t]->conf->trash_only_new || !tmsg->srec || tmsg->srec->uid[1-t] < 0) {
 						debug( "%s: trashing message %d\n", str_ms[t], tmsg->uid );