M_EXPIRED -> M_EXPIRE
This commit is contained in:
parent
40fc6a6ac8
commit
1a536a3415
|
@ -118,7 +118,7 @@ typedef struct group_conf {
|
||||||
#define M_RECENT (1<<0) /* unsyncable flag; maildir_* depend on this being 1<<0 */
|
#define M_RECENT (1<<0) /* unsyncable flag; maildir_* depend on this being 1<<0 */
|
||||||
#define M_DEAD (1<<1) /* expunged */
|
#define M_DEAD (1<<1) /* expunged */
|
||||||
#define M_FLAGS (1<<2) /* flags fetched */
|
#define M_FLAGS (1<<2) /* flags fetched */
|
||||||
#define M_EXPIRED (1<<5) /* kicked out by MaxMessages */
|
#define M_EXPIRE (1<<3) /* kicked out by MaxMessages */
|
||||||
|
|
||||||
typedef struct message {
|
typedef struct message {
|
||||||
struct message *next;
|
struct message *next;
|
||||||
|
|
|
@ -772,7 +772,7 @@ sync_boxes( store_t *ctx[], const char *names[], channel_conf_t *chan )
|
||||||
if ((tmsg->flags & F_FLAGGED) || !tmsg->srec || tmsg->srec->uid[M] <= 0) /* add M_DESYNCED? */
|
if ((tmsg->flags & F_FLAGGED) || !tmsg->srec || tmsg->srec->uid[M] <= 0) /* add M_DESYNCED? */
|
||||||
todel--;
|
todel--;
|
||||||
else if (!(tmsg->status & M_RECENT)) {
|
else if (!(tmsg->status & M_RECENT)) {
|
||||||
tmsg->status |= M_EXPIRED;
|
tmsg->status |= M_EXPIRE;
|
||||||
delt++;
|
delt++;
|
||||||
todel--;
|
todel--;
|
||||||
}
|
}
|
||||||
|
@ -782,7 +782,7 @@ sync_boxes( store_t *ctx[], const char *names[], channel_conf_t *chan )
|
||||||
for (srec = recs; srec; srec = srec->next) {
|
for (srec = recs; srec; srec = srec->next) {
|
||||||
if (srec->status & (S_DEAD|S_EXPIRED))
|
if (srec->status & (S_DEAD|S_EXPIRED))
|
||||||
continue;
|
continue;
|
||||||
if (srec->msg[S] && (srec->msg[S]->status & M_EXPIRED)) {
|
if (srec->msg[S] && (srec->msg[S]->status & M_EXPIRE)) {
|
||||||
debug( " expiring pair(%d,%d)\n", srec->uid[M], srec->uid[S] );
|
debug( " expiring pair(%d,%d)\n", srec->uid[M], srec->uid[S] );
|
||||||
/* log first, so deletion can't be misinterpreted! */
|
/* log first, so deletion can't be misinterpreted! */
|
||||||
Fprintf( jfp, "~ %d %d 1\n", srec->uid[M], srec->uid[S] );
|
Fprintf( jfp, "~ %d %d 1\n", srec->uid[M], srec->uid[S] );
|
||||||
|
|
Loading…
Reference in New Issue
Block a user