CVS commit by ossi:
now that messages know their sync records, M_SYNCES is superfluous.
M +0 -1 isync.h 1.50
M +3 -6 sync.c 1.60
--- isync/src/isync.h #1.49:1.50
@@ -119,5 +119,4 @@ typedef struct group_conf {
#define M_DEAD (1<<1) /* expunged */
#define M_FLAGS (1<<2) /* flags fetched */
-#define M_SYNCED (1<<4) /* already propagated */
#define M_EXPIRED (1<<5) /* kicked out by MaxMessages */
--- isync/src/sync.c #1.59:1.60
@@ -129,6 +129,4 @@ findmsgs( sync_rec_t *srecs, store_t *ct
found:
msg->srec = srec;
- if (srec->uid[1-t] >= 0)
- msg->status |= M_SYNCED;
srec->msg[t] = msg;
nsrec = srec->next;
@@ -623,5 +621,4 @@ sync_boxes( store_t *ctx[], const char *
uid = -1;
}
- tmsg->status |= M_SYNCED;
if (tmsg->srec) {
srec = tmsg->srec;
@@ -769,5 +766,5 @@ sync_boxes( store_t *ctx[], const char *
if ((tmsg->status & M_DEAD) || (tmsg->flags &
F_DELETED))
continue;
- if ((tmsg->flags & F_FLAGGED) || !(tmsg->status &
M_SYNCED)) /* add M_DESYNCED? */
+ if ((tmsg->flags & F_FLAGGED) || !tmsg->srec ||
tmsg->srec->uid[M] <= 0) /* add M_DESYNCED? */
todel--;
else if (!(tmsg->status & M_RECENT)) {
@@ -811,5 +808,5 @@ sync_boxes( store_t *ctx[], const char *
if (tmsg->flags & F_DELETED) {
if (ctx[t]->conf->trash) {
- if
(!ctx[t]->conf->trash_only_new || !(tmsg->status & M_SYNCED)) {
+ if
(!ctx[t]->conf->trash_only_new || !tmsg->srec || tmsg->srec->uid[1-t] < 0) {
debug( " trashing
message %d\n", tmsg->uid );
switch
(driver[t]->trash_msg( ctx[t], tmsg )) {
@@ -821,5 +818,5 @@ sync_boxes( store_t *ctx[], const char *
debug( " not trashing
message %d - not new\n", tmsg->uid );
} else if (ctx[1-t]->conf->trash &&
ctx[1-t]->conf->trash_remote_new) {
- if (!(tmsg->status & M_SYNCED))
{
+ if (!tmsg->srec ||
tmsg->srec->uid[1-t] < 0) {
if
(!ctx[1-t]->conf->max_size || tmsg->size <= ctx[1-t]->conf->max_size) {
debug( "
remote trashing message %d\n", tmsg->uid );
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel
