ok, mismerging and not running the reg-tests is lame. unscrew expunging
again.
This commit is contained in:
		
							parent
							
								
									c7903f8003
								
							
						
					
					
						commit
						16eaf903db
					
				
					 1 changed files with 29 additions and 28 deletions
				
			
		|  | @ -1072,8 +1072,8 @@ sync_boxes( store_t *ctx[], const char *names[], channel_conf_t *chan ) | |||
| 	} | ||||
| 
 | ||||
| 	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) | ||||
| 					if (tmsg->flags & F_DELETED) { | ||||
|  | @ -1103,6 +1103,7 @@ sync_boxes( store_t *ctx[], const char *names[], channel_conf_t *chan ) | |||
| 								debug( "  not remote trashing message %d - not new\n", tmsg->uid ); | ||||
| 						} | ||||
| 					} | ||||
| 			} | ||||
| 
 | ||||
| 			info( "Expunging %s...\n", str_ms[t] ); | ||||
| 			debug( "expunging %s\n", str_ms[t] ); | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue