do not trash expired messages
we are not actually deleting them, so there is no point in saving them in the trash.
This commit is contained in:
parent
48754ecc74
commit
f1eea7d9a5
|
@ -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))) {
|
(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] );
|
debug( "trashing in %s\n", str_ms[t] );
|
||||||
for (tmsg = svars->ctx[t]->msgs; tmsg; tmsg = tmsg->next)
|
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) {
|
||||||
if (!svars->ctx[t]->conf->trash_only_new || !tmsg->srec || tmsg->srec->uid[1-t] < 0) {
|
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 );
|
debug( "%s: trashing message %d\n", str_ms[t], tmsg->uid );
|
||||||
|
|
Loading…
Reference in New Issue
Block a user