virtual - void virtual_box_copy_error() - Wrap src->mailbox_deleted to MAIL_ERROR_EXPUNGED

mbettini-ox · mbettini-ox · commit b8003949e6f7 · 2023-04-21T07:11:56.000Z
diff --git a/src/plugins/virtual/virtual-storage.c b/src/plugins/virtual/virtual-storage.c
@@ -66,6 +66,9 @@ void virtual_box_copy_error(struct mailbox *dest, struct mailbox *src)
 	str = mailbox_get_last_error(src, &error);
 
 	str = t_strdup_printf("%s (for backend mailbox %s)", str, name);
+	if (src->mailbox_deleted)
+		error = MAIL_ERROR_EXPUNGED;
+
 	mail_storage_set_error(dest->storage, error, str);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@ void virtual_box_copy_error(struct mailbox dest, struct mailbox src)`
`66`	`66`	`str = mailbox_get_last_error(src, &error);`
`67`	`67`
`68`	`68`	`str = t_strdup_printf("%s (for backend mailbox %s)", str, name);`
	`69`	`+ if (src->mailbox_deleted)`
	`70`	`+ error = MAIL_ERROR_EXPUNGED;`
	`71`	`+`
`69`	`72`	`mail_storage_set_error(dest->storage, error, str);`
`70`	`73`	`}`
`71`	`74`