prefer context.get_config() over context.sql.get_config() as the latter does not handle default values.

This commit is contained in:
B. Petersen
2019-10-03 16:53:23 +02:00
parent b4b8a1d15b
commit c6b2d640ae
8 changed files with 28 additions and 71 deletions

View File

@@ -1,5 +1,6 @@
use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
use crate::config::Config;
use crate::constants::*;
use crate::context::Context;
use crate::dc_tools::*;
@@ -476,15 +477,8 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context) {
}
16 => {
progress!(context, 900);
let flags: libc::c_int = if 0
!= context
.sql
.get_config_int(context, "mvbox_watch")
.unwrap_or_else(|| 1)
|| 0 != context
.sql
.get_config_int(context, "mvbox_move")
.unwrap_or_else(|| 1)
let flags: libc::c_int = if 0 != context.get_config_int(Config::MvboxWatch)
|| 0 != context.get_config_int(Config::MvboxMove)
{
DC_CREATE_MVBOX as i32
} else {