CVS commit by ossi: 

ok, mismerging and not running the reg-tests is lame. unscrew expunging
again.


  M +29 -28    sync.c   1.82


--- isync/src/sync.c  #1.81:1.82
@@ -1073,6 +1073,6 @@ sync_boxes( store_t *ctx[], const char *
 
        for (t = 0; t < 2; t++) {
-               if ((svars->chan->ops[t] & OP_EXPUNGE) &&
-                       (svars->ctx[t]->conf->trash || 
(svars->ctx[1-t]->conf->trash && svars->ctx[1-t]->conf->trash_remote_new))) {
+               if (svars->chan->ops[t] & OP_EXPUNGE) {
+                       if (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)
@@ -1104,4 +1104,5 @@ sync_boxes( store_t *ctx[], const char *
                                        }
                                }
+                       }
 
                        info( "Expunging %s...\n", str_ms[t] );




-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel

Reply via email to